mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 11:41:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
3081 commits 219 branches 562 tags 474 MiB
Commit graph

3081 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
79c01fa1a4 Remove empty lines 2016-11-10 11:03:43 +00:00
Luke Barnard
f5bc8d1fe0 Removed logs, updated phrasing on 'others joined' 
Now it's:
 1 user joined and left
 >1 others joined and left
 2016-11-10 10:42:33 +00:00
Luke Barnard
5f0b891d47 Add date seperator to the expanded events 
netsplits across midnight is not handled, and @richvdh suggested splitting the list in two
 2016-11-09 17:44:43 +00:00
Luke Barnard
04a934f738 Trying to get rid of the date separator problem 2016-11-09 16:24:56 +00:00
Luke Barnard
2f02c4b84e WIP nicer join/part folding 2016-11-09 16:03:35 +00:00
David Baker
3e9414b21e Merge pull request #533 from matrix-org/markjh/encrypted-attachments 
Encrypt attachments in encrypted rooms,
 2016-11-09 09:45:01 +00:00
Richard van der Hoff
f2222c84a8 Merge pull request #545 from matrix-org/dbkr/fix_ctrl_e 
Fix the ctrl+e mute camera shortcut
 2016-11-08 18:37:58 +00:00
David Baker
a008f5010a Fix the ctrl+e mute camera shortcut 
* Fixes the altgr+e shortcut on Windows
   (Fixes https://github.com/vector-im/vector-web/issues/2561)
 * Fixes the shortcuts to be cmd+e on mac rather than ctrl+e
   which is more normal and doesn't clobber ctrl+e which old
   school unix types use for go-to-end-of-line.
 2016-11-08 18:04:22 +00:00
Luke Barnard
cd241a4a17 Truncate consecutive member events 
This is needed for the IRC bridge to be able to do full membership list syncing without cluttering the message panel.
 2016-11-08 16:34:02 +00:00
Mark Haines
c838164f40 Make the promises be q promises 2016-11-08 16:26:25 +00:00
Mark Haines
93ddb5539e Make imports more consistent, fix m.video 2016-11-08 12:57:24 +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
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
Luke Barnard
de83e578e7 Use generic error message 2016-11-08 11:18:44 +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
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
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
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
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
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
da10660c86 Merge remote-tracking branch 'origin/develop' into rav/add_client_to_context 2016-11-04 10:35:41 +00:00
David Baker
bd36792303 Merge pull request #535 from matrix-org/rav/factor_out_loggedinpanel 
Factor out LoggedInView from MatrixChat
 2016-11-04 10:34:52 +00:00
David Baker
6de5713543 Merge branch 'master' into develop 2016-11-04 10:11:24 +00:00
David Baker
1368d90e66 v0.7.5 2016-11-04 10:09:11 +00:00
David Baker
d7bc408070 Prepare changelog for v0.7.5 2016-11-04 10:09:10 +00:00
David Baker
fa967da2a9 matrix-js-sdk 0.6.4 2016-11-04 10:07:50 +00:00
Richard van der Hoff
cb5b311e44 Move saveScrollState into RoomView 
It fits much more naturally here than in LoggedInView.
 2016-11-04 09:28:35 +00:00
Richard van der Hoff
ab7007784f Make MemberInfo use the matrixclient from the context 
An arbitrary component to demonstrate how this works
 2016-11-03 19:05:48 +00:00
Richard van der Hoff
d3f20e1d9d Add the MatrixClient to the react context 
Because that's the reacty way
 2016-11-03 19:02:27 +00:00
Richard van der Hoff
f85a37c667 Factor out LoggedInView from MatrixChat 
The idea here is to make a layer which sits around for as long as we have a
valid MatrixClient. Also it makes a plausible split for the render of
MatrixChat, even if they are much too tightly bound for now.
 2016-11-03 18:59:32 +00:00
David Baker
842b5aed56 The variable is called roomId here 2016-11-03 17:13:02 +00:00