mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-27 21:18:13 +03:00
Code Issues Projects Releases Packages Wiki Activity
25122 commits 208 branches 547 tags 609 MiB
Commit graph

25122 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aaron Raimist
92c28f089c
Add max-width to right and left panels 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-06-03 14:56:48 -05:00
Weblate
bfff565eae Merge branch 'origin/develop' into Weblate. 2020-06-03 19:28:06 +00:00
Michael Telatynski
10bdb4975e
Merge pull request #4685 from matrix-org/t3chguy/sso-query 
Fix login loop where the sso flow returns to `#/login`
 2020-06-03 20:28:01 +01:00
Weblate
3f028725ec Merge branch 'origin/develop' into Weblate. 2020-06-03 19:23:30 +00:00
Michael Telatynski
5b775fd63c
Merge pull request #4690 from matrix-org/t3chguy/mau-toasts 
Don't clear MAU toasts when a successful sync comes in
 2020-06-03 20:23:25 +01:00
Michael Telatynski
899f9ede45 change names of consts for clarity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 20:23:01 +01:00
Weblate
9898532b49 Merge branch 'origin/develop' into Weblate. 2020-06-03 19:21:19 +00:00
Travis Ralston
380ba163e4
Merge pull request #4681 from matrix-org/travis/room-list/filtering 
Add initial filtering support to new room list
 2020-06-03 13:21:13 -06:00
Michael Telatynski
5a4723d243 don't specify hs_disabled as its a Synapse special 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 20:13:32 +01:00
Travis Ralston
bc2fbefb5c Remove iteratorToArray 2020-06-03 11:29:06 -06:00
Weblate
abbcc316ed Merge branch 'origin/develop' into Weblate. 2020-06-03 16:10:11 +00:00
Travis Ralston
013751e308
Merge pull request #4664 from matrix-org/foldleft/13523-hide-empty-verifications 
Bubble up a decline-to-render of verification events to outside wrapper
 2020-06-03 10:10:06 -06:00
Weblate
133c873b31 Merge branch 'origin/develop' into Weblate. 2020-06-03 16:09:39 +00:00
Tirifto
520bb1e6fa Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2257 of 2257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-06-03 16:09:39 +00:00
Michael Telatynski
3c922329fe
Merge pull request #4672 from matrix-org/matthew/emoji13 
upgrade to twemoji 13.0.0
 2020-06-03 17:09:32 +01:00
Jorik Schellekens
5bc756cba1 Fix checkbox bleed 2020-06-03 16:48:05 +01:00
Michael Telatynski
9c417cfbad Don't clear MAU toasts when a successful sync comes in 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 16:17:31 +01:00
Weblate
9864e5d783 Merge branch 'origin/develop' into Weblate. 2020-06-03 14:37:25 +00:00
Michael Telatynski
030cc5cdea
Merge pull request #4666 from matrix-org/t3chguy/image-view-focuslock 
Apply FocusLock to ImageView to capture Escape handling
 2020-06-03 15:37:18 +01:00
Weblate
b381b3825b Merge branch 'origin/develop' into Weblate. 2020-06-03 13:44:13 +00:00
random
003e75968a Translated using Weblate (Italian) 
Currently translated at 100.0% (2257 of 2257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-03 13:44:13 +00:00
Priit Jõerüüt
677c7aac45 Translated using Weblate (Estonian) 
Currently translated at 57.8% (1304 of 2257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-03 13:44:13 +00:00
David Baker
caea153962
Merge pull request #4689 from matrix-org/dbkr/fix_complete_security 
Fix the 'complete security' screen
 2020-06-03 14:44:06 +01:00
David Baker
ddcd3fb806 Fix the 'complete security' screen 
https://github.com/matrix-org/matrix-react-sdk/pull/4655 removed
the check for cross-signing account data where the cross-signing
labs flag was enabled if you had an existing cross-signing setup.
This also sent the user to the 'complete security' view rather than
the 'E2E Setup' view though, which meant new logins should always
see the E2E setup screen (ie. be prompted to upgrade encryption).

NB. We need to change this check for SSSS keys in account data
(https://github.com/vector-im/riot-web/issues/13894) but we should
put this back the way it was in the meantime.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4655
 2020-06-03 14:31:34 +01:00
Michael Telatynski
d92f742205 Fix Jitsi wellknown hooks some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 14:09:45 +01:00
Michael Telatynski
a674131a8c Fix Jitsi wellknown hooks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 13:58:17 +01:00
Michael Telatynski
5156388fc6 Change well known poll period to 2 hours to match existing Jitsi poll 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 12:25:57 +01:00
Weblate
b51fbfd0c8 Merge branch 'origin/develop' into Weblate. 2020-06-03 09:59:19 +00:00
Michael Telatynski
6d11b4f99b
Merge pull request #4688 from matrix-org/t3chguy/autocomplete-scrollintoview 
add null-guard for Autocomplete containerRef
 2020-06-03 10:59:14 +01:00
Michael Telatynski
eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.js
	src/components/views/dialogs/InviteDialog.js
	src/components/views/right_panel/UserInfo.js
	src/createRoom.js
 2020-06-03 10:51:17 +01:00
Weblate
bde8cc7bd6 Merge branch 'origin/develop' into Weblate. 2020-06-03 09:45:52 +00:00
Michael Telatynski
936445ab2d
Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD 
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
 2020-06-03 10:45:47 +01:00
Weblate
38be84e677 Merge branch 'origin/develop' into Weblate. 2020-06-03 09:42:24 +00:00
Kévin C
89c33b2c38 Translated using Weblate (French) 
Currently translated at 100.0% (2303 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-03 09:42:24 +00:00
Priit Jõerüüt
a165066d19 Translated using Weblate (Estonian) 
Currently translated at 57.3% (1320 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-03 09:42:24 +00:00
Jeff Huang
d33cd5d6f8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2303 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-03 09:42:19 +00:00
Michael Telatynski
653b2ff060
Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing 
Remove feature_cross_signing
 2020-06-03 10:42:13 +01:00
Michael Telatynski
b120488857 add null-guard for Autocomplete containerRef 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 10:39:28 +01:00
Michael Telatynski
7cfeda96d0
Merge pull request #4670 from matrix-org/t3chguy/autocomplete-scrollintoview 
Autocomplete: use scrollIntoView for auto-scroll to fix it
 2020-06-03 09:55:00 +01:00
Michael Telatynski
170acef796 Fix sizing of the security warning icon 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 21:54:38 +01:00
Michael Telatynski
d99babfe05 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-02 21:51:05 +01:00
Michael Telatynski
48c535e578 hide setup encryption toasts on an e2ee-default:false config 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 21:40:32 +01:00
Michael Telatynski
113a9d71b5 Fix login loop where the sso flow returns to #/login 
due to fragmentAfterLogin going back to `#/login`
and https://github.com/vector-im/riot-web/issues/11643

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 16:26:07 +01:00
RiotRobot
ec35445bf0 v2.7.0-rc.2 2020-06-02 14:37:47 +01:00
RiotRobot
c31cfbd3eb Prepare changelog for v2.7.0-rc.2 2020-06-02 14:37:47 +01:00
Michael Telatynski
8a93a9dda7
Merge pull request #4684 from matrix-org/t3chguy/emoji_picker_composer 
Rewire the Sticker button to be an Emoji Picker to release
 2020-06-02 14:29:58 +01:00
Michael Telatynski
b50046f1ab
Merge pull request #3747 from matrix-org/t3chguy/emoji_picker_composer 
Rewire the Sticker button to be an Emoji Picker
 2020-06-02 14:13:08 +01:00
Michael Telatynski
3fbfb62bc9 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer 2020-06-02 14:00:37 +01:00
RiotRobot
039c42dc09 v2.7.0-rc.1 2020-06-02 13:59:10 +01:00
RiotRobot
5880297055 Prepare changelog for v2.7.0-rc.1 2020-06-02 13:59:10 +01:00