OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
25,012 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

19915 Commits (5aff8f79150e7801540a28e90d7f5983e27bd8b1)

Author SHA1 Message Date
Bruno Windels 40cabd2589 When trying to restore a keyback that has its key in 4S, check if 4S will be readable 
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
 2020-06-04 14:03:48 +02:00
Michael Telatynski 096045a037 change names of consts for clarity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-03 22:15:01 +01:00
Michael Telatynski 84d81ff09b 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-03 22:15:01 +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
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 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 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
Jorik Schellekens 6801751745 No logging 2020-06-01 18:08:52 +01:00
Jorik Schellekens 7db95b614a Revert to arrow functions to bind `this` 2020-06-01 18:01:12 +01:00
Weblate 70423178de Merge branch 'origin/develop' into Weblate. 2020-06-01 16:58:08 +00:00
Jorik Schellekens 8fea9e831e
Merge pull request #4665 from JorikSchellekens/joriks/appearance-tab 
Create and use stylised checkboxes
 2020-06-01 17:58:03 +01:00
Weblate bcf732b763 Merge branch 'origin/develop' into Weblate. 2020-06-01 16:57:47 +00:00
Jorik Schellekens c1adee376f
Merge pull request #4676 from JorikSchellekens/joriks/fix-irc-resizer 
useIRCLayout moved to props
 2020-06-01 17:57:43 +01:00
Jorik Schellekens df18638164 useIRCLayout moved to props 2020-06-01 17:34:42 +01:00
Weblate 24234c9d9c Merge branch 'origin/develop' into Weblate. 2020-06-01 16:25:49 +00:00
Nils J. Haugen 7d0ccabe6c Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 55.6% (1279 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
 2020-06-01 16:25:48 +00:00
random a57ef5c170 Translated using Weblate (Italian) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-01 16:25:48 +00:00
notramo d19c5b8400 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-01 16:25:48 +00:00
Tuomas Hietala 858b52cd85 Translated using Weblate (Finnish) 
Currently translated at 95.7% (2204 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-06-01 16:25:48 +00:00
Michael Telatynski 19e8fa01f2 use import instead of getComponent 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 17:05:53 +01:00
Jorik Schellekens 53129cafc7 Move comment 2020-06-01 15:36:55 +01:00
Jorik Schellekens fb9b14ec51 Remove superflous list 2020-06-01 15:35:25 +01:00
Michael Telatynski 7b2f2daf2c Upload and Paste to Upload tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 15:00:55 +01:00
Jorik Schellekens 69747b6114 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab 2020-06-01 14:32:31 +01:00
Jorik Schellekens 9e9bcb4974 Move id generator into constrcutor 2020-06-01 12:04:47 +01:00
Weblate 044010adb7 Merge branch 'origin/develop' into Weblate. 2020-05-31 20:17:29 +00:00
notramo 610c35e8cc Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-05-31 20:17:28 +00:00
Szimszon 179da0132b Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-05-31 20:17:27 +00:00
XoseM 609e35b5ea Translated using Weblate (Galician) 
Currently translated at 51.9% (1195 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-05-31 20:17:25 +00:00
Kévin C fc638ffc3e Translated using Weblate (French) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-05-31 20:17:22 +00:00
Tirifto 7c290b4b5d Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-05-31 20:17:22 +00:00
Stanislav Lukeš 5da9c414e3 Translated using Weblate (Czech) 
Currently translated at 94.4% (2172 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-05-31 20:17:21 +00:00
Jeff Huang cf465a4595 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-05-31 20:17:20 +00:00