nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,959 Commits 258 Branches 582 Tags
f52d7a8e207301ac62497ca7cd25bf64b6834d81
Commit Graph

62959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
5b7f629996 Build to the 'webapp' directory instead 
People may have config files in vector/ so it would be nonideal
if we started overwriting them / blowing them away.
 2016-11-08 15:46:21 +00:00
David Baker
a4c16b896b Merge remote-tracking branch 'origin/develop' into dbkr/build_vector_dir 2016-11-08 15:44:27 +00:00
David Baker
d150ee0d05 Missed a -w 2016-11-08 15:30:19 +00:00
David Baker
7bf69d067a Another missed file from the windows fixes 
This time the icon file for the window
 2016-11-08 14:35:59 +00:00
David Baker
ccc43cc0ed Merge pull request #2555 from vector-im/dbkr/auto_update_config 
Make auto-update configureable
 2016-11-08 14:33:44 +00:00
David Baker
f7091d2fdd Merge pull request #2556 from vector-im/dbkr/windows_fixes_missed_files 
Missed files electron windows fixes
 2016-11-08 14:33:19 +00:00
David Baker
1e2cd9c2d1 Build all of the vector dir in the build process 
So the whole vector/ directory can now be removed during the build
process and we don't ship random files that end up in the vector
directory.
 2016-11-08 14:30:12 +00:00
Mark Haines
93ddb5539e Make imports more consistent, fix m.video 2016-11-08 12:57:24 +00:00
David Baker
a2a3d7a0f9 Remove spurious log line 2016-11-08 11:45:11 +00:00
David Baker
d871ca2b24 PR feedback 2016-11-08 11:43:24 +00:00
Mark Haines
911f9e4e63 Review comments 2016-11-08 11:42:20 +00:00
Luke Barnard
abc306be6c Merge pull request #2554 from vector-im/luke/feature-show-integration-error-popup 
Add some CSS for  scalar error popup
 2016-11-08 11:27:49 +00:00
Luke Barnard
5a61a1e6e1 Merge pull request #543 from matrix-org/luke/feature-show-integration-error-popup 
Show the error that occured when trying to reach scalar
 2016-11-08 11:27:32 +00:00
David Baker
ccea483f4f Missed files electron windows fixes 
Missed from https://github.com/vector-im/vector-web/pull/2551

 * squirrel hooks file for handling install / uninstall events
 * Install 'spinner' gif for windows (ours does not spin)
 2016-11-08 11:20:47 +00:00
Luke Barnard
de83e578e7 Use generic error message 2016-11-08 11:18:44 +00:00
David Baker
84aac88677 Make auto-update configureable 
Otherwise everyone that builds electron vector will end up with
their apps auto-updatin to our version when we release an update.

Coming next: A way to manage our electron release process to make
sure we never ship a build with auto-update disabled.
 2016-11-08 11:07:36 +00:00
Luke Barnard
c0c662aeaf Show the error that occured when trying to reach scalar 
Instead of removing the button and printing an error to console, show the error in a popup that appears next to the `Manage Integrations` button.
 2016-11-08 10:57:48 +00:00
Luke Barnard
b30df2115c Add some CSS for an error popup that appears next to the Manage Integrations button if there was a problem contacting Scalar 2016-11-08 10:54:03 +00:00
David Baker
8d46077ac2 Support for get_app_version 2016-11-08 10:47:01 +00:00
David Baker
d44adcb7a9 Fix the vector web version in UserSettings 
Add a getAppVersion() function to the platform rather than relying
on the updater code firing an event before we know what the app
version is.
 2016-11-08 10:45:19 +00:00
Richard van der Hoff
0441fcf3df Merge pull request #2552 from vector-im/dbkr/electron_catch_unhandled_errors 
Catch unhandled errors in the electron process
 2016-11-07 15:22:11 +00:00
David Baker
b223d3b385 Catch unhandled errors in the electron process 
Otherwise we pop up stack traces in dialog boxes if it fails to
to poll for updates or something.
 2016-11-07 14:37:12 +00:00
David Baker
e033ce6c43 Merge pull request #2551 from vector-im/dbkr/electron_windows_fixes 
Slight grab-bag of fixes for electron on Windows
 2016-11-07 13:54:38 +00:00
David Baker
884ae0e218 Merge pull request #541 from matrix-org/dbkr/dont_preview_matrix_to 
Don't do URL previews for matrix.to
 2016-11-07 12:32:33 +00:00
David Baker
5c2c01d414 Fix function to consistently return boolean 2016-11-07 11:45:55 +00:00
David Baker
6681205337 Slight grab-bag of fixes for electron on Windows 
* Implement the squirrel install / uninstall hooks (so we have
   a start menu entry / desktop shortcut)
 * Wait longer before checking for update
 * Set the window icon
 * Add a 'file' menu
 * Bump electron-builder
 * Add the icon url for the control panel entry
 2016-11-07 11:41:41 +00:00
David Baker
2bb7aec0de Don't do URL previews for matrix.to 2016-11-07 10:57:08 +00:00
David Baker
b86f9f362a Merge pull request #540 from matrix-org/rav/fix_npe 
Fix NPE in LoggedInView
 2016-11-07 09:57:46 +00:00
Richard van der Hoff
2ee98e9fdc Fix NPE in LoggedInView 
Fixes a NPE displaying the new version bar
(also fix displayname for WithMatrixClient)
 2016-11-07 09:28:10 +00:00
Mark Haines
dc679a8eca Fix gif hoverover 2016-11-04 18:41:05 +00:00
Mark Haines
4214c67f8f Pass the decryptedUrl to the MFileBody so that it doesn't need to decrypt it itself. 2016-11-04 18:20:20 +00:00
Mark Haines
1529396ef5 Make everything use MFileBody for downloads, ensure that encrypted attachments are actually downloaded 2016-11-04 18:09:12 +00:00
Mark Haines
8f778f54fd Use data:// URI rather than blob: URI to avoid XSS 2016-11-04 15:39:39 +00:00
Mark Haines
6ea0085290 Decrypt m.file attachments 2016-11-04 14:00:26 +00:00
Mark Haines
94bfe31857 Decrypt m.audio attachments 2016-11-04 13:45:00 +00:00
Mark Haines
91123431dd Fix unencrypted video thumbnail 2016-11-04 13:13:25 +00:00
Mark Haines
71c002d588 Remove spurious TODO 2016-11-04 13:08:17 +00:00
Mark Haines
48cfd4f399 Decypt m.video events 2016-11-04 13:05:34 +00:00
David Baker
6da1a1077d 0.8.4 has been released 2016-11-04 13:03:11 +00:00
David Baker
c973dbf1c4 0.7.5 has been released 2016-11-04 13:02:12 +00:00
Mark Haines
b6653dd0ed Move decryptFile into a utility function so that it can be shared between different components 2016-11-04 12:46:45 +00:00
Mark Haines
12fc70c671 Include the mimetype with the file info. Store the objectURL in state so that it can be used normally by the exising templates 2016-11-04 11:52:47 +00:00
Richard van der Hoff
5ac0aac65b Merge pull request #538 from matrix-org/dbkr/matrix_to_links 
Make room alias & user ID links matrix.to links
 2016-11-04 11:42:49 +00:00
David Baker
04c27205a3 Make room alias & user ID links matrix.to links 2016-11-04 11:38:28 +00:00
David Baker
3a0b63dbda Merge pull request #537 from matrix-org/rav/memberinfo_use_client_from_context 
Make MemberInfo use the matrixclient from the context
 2016-11-04 10:59:11 +00:00
David Baker
80bae0563d Merge pull request #2535 from vector-im/dbkr/electron_3 
Electron app (take 3)
 2016-11-04 10:56:59 +00:00
David Baker
f301e55b6e Merge remote-tracking branch 'origin/develop' into rav/memberinfo_use_client_from_context 2016-11-04 10:54:32 +00:00
David Baker
0ab46df94a Merge pull request #536 from matrix-org/rav/add_client_to_context 
Add the MatrixClient to the react context
 2016-11-04 10:54:11 +00:00
David Baker
9a00ec128c many semicolons 2016-11-04 10:46:51 +00:00
David Baker
da10660c86 Merge remote-tracking branch 'origin/develop' into rav/add_client_to_context 2016-11-04 10:35:41 +00:00