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

21705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
e6d8c4a576 Merge branches 'develop' and 't3chguy/alpha_room_list' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list 2020-02-21 11:18:45 +00:00
Bruno Windels
744826db48
Merge pull request #4096 from matrix-org/bwindels/canonicalpill 
Accept canonical alias for pills
 2020-02-20 17:07:54 +00:00
Bruno Windels
d324dfaceb
Merge pull request #4094 from matrix-org/bwindels/dontsaywecanscan 
Fix: don't advertise ability to scan a QR code for verification
 2020-02-20 16:44:27 +00:00
Bruno Windels
fee9c7d21f accept canonical alias for pills 2020-02-20 17:43:33 +01:00
Damir Jelić
81e61d6f9d EventIndexPanel: Move the comments around for the getStats calls. 2020-02-20 14:46:10 +01:00
Damir Jelić
a650c47d6b ManageEventIndexDialog: Add a space before the function parenthesis. 2020-02-20 14:46:10 +01:00
Damir Jelić
1897d67818 EventIndexPanel: Catch getStats failures. 
Getting the stats can fail when used with Seshat. Tantivy periodically
garbage collects its files. Smaller files are merged and the old ones
are removed.

If garbage collection occurs while we try to get the stats, which go
trough the files and figure out their sizes, we can end up trying to
figure out the file size of a removed file. The getStats call will fail
in this case but we can ignore the failure since we will likely get a
nice result next time we try.
 2020-02-20 14:46:10 +01:00
Damir Jelić
9e3b0fdf7c EventIndexPanel: Fix the removal of the updateCurrentRoom listeners. 
The event listeners that update the current room and try to get the
current stats from the event index don't seem to be unmounted because
this != this confusion.

Turning them into arrow methods of the react class fixes this.
 2020-02-20 14:46:10 +01:00
J. Ryan Stinnett
2dd093de49
Merge pull request #4095 from matrix-org/jryans/rm-release-exec 
Remove exec so release script continues
 2020-02-20 13:37:44 +00:00
J. Ryan Stinnett
31e82b8050 Remove exec so release script continues 
We now want to do post-processing after the JS SDK release script, so we can't
use `exec` here.
 2020-02-20 12:05:08 +00:00
Michael Telatynski
b1a3d8ad63
Merge pull request #4092 from matrix-org/t3chguy/persist 
Use Persistent Storage where possible
 2020-02-20 11:56:54 +00:00
J. Ryan Stinnett
766f523c00 Reset matrix-js-sdk back to develop branch 2020-02-20 11:41:53 +00:00
Bruno Windels
fb28bbbaa6 dont say we can scan when we dont 2020-02-20 12:06:34 +01:00
Bruno Windels
86c871f55f
Merge pull request #4088 from matrix-org/bwindels/fixuserpage 
Fix user page (missing null check)
 2020-02-20 11:01:15 +00:00
Bruno Windels
913caf67a9
Merge pull request #4081 from matrix-org/bwindels/cancelondialogclose 
Cancel verification request on dialog close
 2020-02-20 11:00:00 +00:00
Michael Telatynski
b72042496e
Merge pull request #4093 from matrix-org/t3chguy/leaks 
Fix various memory leaks due to method re-binding
 2020-02-20 03:01:25 +00:00
Michael Telatynski
16bbea0b59 Fix various leaks due to method re-binding 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-20 02:35:30 +00:00
Michael Telatynski
ffde11ca91 Use Persistent Storage where possible 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-20 00:38:08 +00:00
Michael Telatynski
12eb408c58
Merge pull request #4073 from matrix-org/t3chguy/a11y_share_msg 
Fix share message context menu option keyboard a11y
 2020-02-19 17:41:28 +00:00
Michael Telatynski
f074e85863 tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 16:35:05 +00:00
RiotRobot
2d05205c9e v2.1.1 2020-02-19 16:03:58 +00:00
RiotRobot
faf8a5c2db Prepare changelog for v2.1.1 2020-02-19 16:03:57 +00:00
RiotRobot
a687d158e8 Released js-sdk 2020-02-19 15:59:37 +00:00
Michael Telatynski
5a31b308cd remove unused clause 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 15:09:05 +00:00
Michael Telatynski
d1503d8a65 fix edge case 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 14:55:49 +00:00
Michael Telatynski
a6edc34e97 Iterate things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 14:52:00 +00:00
Michael Telatynski
d70a9bd001 small tweaks, still not working reliably 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 14:39:36 +00:00
Bruno Windels
9ab861121d
Merge pull request #4090 from matrix-org/bwindels/localaliasspinner 
show spinner while loading local aliases
 2020-02-19 14:34:27 +00:00
Bruno Windels
a5b9682572 show spinner while loading local aliases 2020-02-19 15:15:05 +01:00
Damir Jelić
7f71e551da EventIndex: Split out the statements that check for a valid event type. 2020-02-19 14:50:59 +01:00
Damir Jelić
156c6b8db8 EventIndex: Document the return value of the isValidEvent method. 2020-02-19 14:50:59 +01:00
Damir Jelić
59f8b4f6b1 EventIndex: Don't index key verification events. 
Since cross-signing is a thing key verification events have become part
of the timeline and room history.

Those events are m.room.message events for backwards compatibility, so
clients that don't support key verification in the timeline print out a
fall-back message.
 2020-02-19 14:50:59 +01:00
Michael Telatynski
4278d44059 Merge branches 'develop' and 't3chguy/alpha_room_list' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list 2020-02-19 13:30:47 +00:00
Michael Telatynski
b1b17a313e
Merge pull request #4046 from matrix-org/t3chguy/usercontent 
Get rid of dependence on usercontent.riot.im
 2020-02-19 12:53:01 +00:00
Michael Telatynski
4da5f32764 get rid of lockOrigin backwards compatibility 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-19 12:44:46 +00:00
Bruno Windels
5b8551df1f
Merge pull request #4089 from matrix-org/bwindels/fixnoaliasesforpublicroom 
also detect aliases using new /aliases endpoint for room access settings
 2020-02-19 10:28:45 +00:00
Bruno Windels
30ae6dbdbb also detect aliases using new /aliases endpoint for room access settings 2020-02-19 11:18:56 +01:00
Bruno Windels
6118e9621e
Merge pull request #4086 from matrix-org/bwindels/fixaliases 
get local aliases from /aliases in room settings
 2020-02-19 10:02:50 +00:00
Bruno Windels
cb5882d59b add null check 2020-02-19 10:40:00 +01:00
Bruno Windels
4c9c57bfe5 check server feature flag 
if not available, revert to old behavior
 2020-02-19 10:06:52 +01:00
Bruno Windels
e6ca581f10 get local aliases from /aliases in room settings 2020-02-18 16:27:45 +01:00
Michael Telatynski
600cb64d00 don't nest <a> inside <AccessibleButton> 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-18 15:04:57 +00:00
Michael Telatynski
932c9b3106 First attempt alpha room list sorting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-18 14:55:12 +00:00
Zoe
27f65c17b5
Merge pull request #4080 from matrix-org/foldleft/12187-e2e-dm 
Start verification sessions in an E2E DM where possible
 2020-02-18 13:53:56 +00:00
Zoe
0e0aadd3f2 fixed inexplicible scope bug 2020-02-18 11:30:10 +00:00
Zoe
164b355ffe abstract out the check for available target devices 2020-02-18 11:25:19 +00:00
Bruno Windels
1b38827d92
Merge pull request #4077 from matrix-org/bwindels/filterverifmethods 
Only show supported verification methods
 2020-02-18 10:16:01 +00:00
Bruno Windels
46e63fd571 cancel on dialog close 2020-02-18 11:14:16 +01:00
Bruno Windels
05403eb98c
Merge pull request #4072 from matrix-org/bwindels/localecho2 
Use local echo in VerificationRequest for accepting/declining a verification request
 2020-02-18 09:55:27 +00:00
Zoe
23596031db rip foldleft, died of lint issues 2020-02-17 16:00:25 +00:00