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

25035 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Michael Telatynski
ef1d682683 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 13:51:58 +01:00
Michael Telatynski
3020e395c1 iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 13:48:08 +01:00
J. Ryan Stinnett
a140f5219e
Merge pull request #4683 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-06-02 13:32:40 +01:00
LinAGKar
8672e4849e Translated using Weblate (Swedish) 
Currently translated at 64.4% (1482 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2020-06-02 12:29:56 +00:00
Weblate
9b975820a3 Merge branch 'origin/develop' into Weblate. 2020-06-02 09:14:19 +00:00
XoseM
833732e732 Translated using Weblate (Galician) 
Currently translated at 52.3% (1204 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-02 09:14:19 +00:00
Slavi Pantaleev
2794bf3c00 Translated using Weblate (Bulgarian) 
Currently translated at 95.6% (2201 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-06-02 09:14:18 +00:00
J. Ryan Stinnett
0717c7749e
Merge pull request #4347 from MTRNord/fix-register-auth-with-new-spec 
Make auth argument in the register request compliant with r0.6.0
 2020-06-02 10:14:09 +01:00
Weblate
945ebfc45c Merge branch 'origin/develop' into Weblate. 2020-06-02 06:22:20 +00:00
Travis Ralston
25ce71a4b8
Merge pull request #4682 from matrix-org/revert-4494-auxpanel-scrolling-persisted 
Revert "Prevent PersistedElements overflowing scrolled areas"
 2020-06-02 00:22:15 -06:00
Travis Ralston
613b994f9d
Revert "Prevent PersistedElements overflowing scrolled areas" 2020-06-02 00:21:31 -06:00
Weblate
42a3dda39d Merge branch 'origin/develop' into Weblate. 2020-06-01 21:44:10 +00:00
Travis Ralston
3d8e9f9edb
Merge pull request #4680 from matrix-org/travis/rm-tagbuttons 
Remove unused TagPanelButtons
 2020-06-01 15:44:06 -06:00
Travis Ralston
4dda573527 i18n 2020-06-01 15:43:29 -06:00
Travis Ralston
5b6118dad4 Remove the unused GroupsButton too 2020-06-01 15:39:22 -06:00
Travis Ralston
ad617f9e3a Remove unused TagPanelButtons 
This isn't used, and is just confusing. The feedback dialog is still used by the top left menu.
 2020-06-01 15:35:08 -06:00
Weblate
f2b33f7577 Merge branch 'origin/develop' into Weblate. 2020-06-01 21:00:56 +00:00
Jorik Schellekens
c66a277409
Merge pull request #4679 from JorikSchellekens/joriks/fix-irc-resize-save 
Pass roomId to IRCTimelineProfileResizer
 2020-06-01 22:00:51 +01:00
Jorik Schellekens
5bba62c28b Pass roomId to IRCTimelineProfileResizer 2020-06-01 18:27:10 +01:00
Weblate
0d075fc8ad Merge branch 'origin/develop' into Weblate. 2020-06-01 17:22:27 +00:00
Jorik Schellekens
5caae2051b
Merge pull request #4678 from JorikSchellekens/joriks/draggable-cleanup-console 
Remove logging to console for irc name resize
 2020-06-01 18:22:23 +01:00
Weblate
0b95080356 Merge branch 'origin/develop' into Weblate. 2020-06-01 17:12:09 +00:00
Jorik Schellekens
85faa8ac23
Merge pull request #4677 from JorikSchellekens/joriks/fix-dark-theme-selection 
Use arrow functions instead of binding `this`
 2020-06-01 18:12:05 +01:00
Weblate
b306bb0067 Merge branch 'origin/develop' into Weblate. 2020-06-01 17:11:57 +00:00
Jorik Schellekens
50124d3476
Merge pull request #4675 from JorikSchellekens/joriks/fix-compact-layout-regression 
Increase specificity of compact layout selectors
 2020-06-01 18:11:52 +01:00