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

20128 Commits (b97736f058b6886b6b234ab4aa6ac0a8d66e4ffc)

Author SHA1 Message Date
Weblate b97736f058 Merge branch 'origin/develop' into Weblate. 2020-01-03 16:32:09 +00:00
J. Ryan Stinnett 76f3a08909
Merge pull request #3800 from matrix-org/jryans/key-backup-dialogs-4s 
Update key backup creation and recovery paths for SSSS
 2020-01-03 16:32:02 +00:00
Weblate 21fb15d76a Merge branch 'origin/develop' into Weblate. 2020-01-03 16:04:07 +00:00
David Baker 9bf5449f33
Merge pull request #3798 from matrix-org/dbkr/dont_fail_if_logs_empty 
Don't fail if logs exists and is an empty dir
 2020-01-03 16:04:02 +00:00
Weblate 5096696f4b Merge branch 'origin/develop' into Weblate. 2020-01-03 16:04:01 +00:00
Slavi Pantaleev 33d35c83ba Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (2000 of 2000 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-03 16:04:01 +00:00
David Baker e9fa6032af
Merge pull request #3799 from matrix-org/dbkr/comment_remaining_non_cross_signing_components 
Comment remaining non-cross-signing-compliant components
 2020-01-03 16:03:53 +00:00
J. Ryan Stinnett e12ed04da8 Remove unused import 2020-01-03 15:59:14 +00:00
David Baker 2125bcf5a6 Comment remaining non-cross-signing-compliant components 
Fixes https://github.com/vector-im/riot-web/issues/11748
 2020-01-03 15:38:59 +00:00
J. Ryan Stinnett b8683462e8 Update backup creation paths for SSSS 
This updates the various backup creation entry points to ensure they support
creating with secret storage if the feature flag is enabled.
 2020-01-03 15:34:05 +00:00
Weblate b79e1d47c4 Merge branch 'origin/develop' into Weblate. 2020-01-03 15:24:03 +00:00
Slavi Pantaleev 731279ab2d Translated using Weblate (Bulgarian) 
Currently translated at 99.2% (1985 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-03 15:24:03 +00:00
David Baker f9216ea590
Merge pull request #3797 from matrix-org/dbkr/remove_unverify 
Remove 'unverify' from UserInfoPanel
 2020-01-03 15:23:52 +00:00
David Baker 2970a9faaf Don't fail if logs exists and is an empty dir 2020-01-03 15:16:02 +00:00
David Baker 5faae1d2f2 i18n 2020-01-03 15:05:41 +00:00
David Baker 5897c8ca7f Remove 'unverify' from UserInfoPanel 
It's not in the designs and it's not a thing we can do with
cross-signing (at least not at the moment).
 2020-01-03 15:00:51 +00:00
Weblate f25c1683c8 Merge branch 'origin/develop' into Weblate. 2020-01-03 14:52:50 +00:00
Slavi Pantaleev 0b16f862e9 Translated using Weblate (Bulgarian) 
Currently translated at 97.8% (1956 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-03 14:52:49 +00:00
David Baker 23dffb69ac
Merge pull request #3795 from matrix-org/dbkr/key_backup_checkdevicetrust 
Use deviceTrust when displaying key backup trust status
 2020-01-03 14:52:40 +00:00
J. Ryan Stinnett 4211ec5063 Fix DOM structure in RoomRecoveryReminder 
Buttons (which end up as <div>s) aren't allowed inside <p>s.
 2020-01-03 13:51:45 +00:00
J. Ryan Stinnett d5a82a5fc2 Finish sentence in accessSecretStorage docs 2020-01-03 13:45:57 +00:00
David Baker 43e4f2dcc0 Use deviceTrust when displaying key backup trust status 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1138
 2020-01-03 13:34:43 +00:00
J. Ryan Stinnett 99559c5121 Update backup restore paths for SSSS 
This updates all the various key backup entry points to ensure they use a flow
that supports backups stored under secret storage.
 2020-01-03 13:33:36 +00:00
Weblate b0e71daa61 Merge branch 'origin/develop' into Weblate. 2020-01-03 13:08:52 +00:00
David Baker bcece7dc10
Merge pull request #3793 from matrix-org/dbkr/keyreq_dont_crash_if_removed 
Don't crash if a keyshare request is removed
 2020-01-03 13:08:47 +00:00
Weblate 831ad3ba33 Merge branch 'origin/develop' into Weblate. 2020-01-03 13:08:40 +00:00
catborise c8f9df691b Translated using Weblate (Turkish) 
Currently translated at 50.8% (1017 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-03 13:08:40 +00:00
Slavi Pantaleev b6572f7042 Translated using Weblate (Bulgarian) 
Currently translated at 97.4% (1948 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-03 13:08:35 +00:00
David Baker b0ca8f24d4
Merge pull request #3794 from matrix-org/dbkr/slashverify_checkdevicetrust 
Convert /verify to checkDeviceTrust
 2020-01-03 13:08:24 +00:00
David Baker c2723176e4 Convert /verify to checkDeviceTrust 
Also de-promiseify the code a bit
 2020-01-03 12:08:35 +00:00
David Baker 557669b08e Don't crash if a keyshare request is removed 
...during the time the dialog is displayed.

Fixes https://github.com/vector-im/riot-web/issues/11745 (hopefully)
 2020-01-03 11:12:55 +00:00
Weblate 015bca32ac Merge branch 'origin/develop' into Weblate. 2020-01-02 17:16:30 +00:00
David Baker 560cff0ae1
Merge pull request #3791 from matrix-org/dbkr/remove_e2etile_onclick 
Remove E2eIcon onClick
 2020-01-02 17:16:25 +00:00
David Baker 89ac476281 Unused import 2020-01-02 16:59:46 +00:00
David Baker 39777620a3 order copyright lines by date 2020-01-02 16:58:00 +00:00
David Baker ffba19bd61 Remove E2eIcon onClick 
It displayed the Encrypted Event Info dialog, but this full of
super advanced debug information and base64 strings that no normal
users should ever have to see. It's still accessible via the comtext
menu (ie. the same place as 'View Source').
 2020-01-02 16:52:25 +00:00
Weblate 2c126f3588 Merge branch 'origin/develop' into Weblate. 2020-01-02 16:19:10 +00:00
Slavi Pantaleev 31367bac57 Translated using Weblate (Bulgarian) 
Currently translated at 93.5% (1870 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-01-02 16:19:10 +00:00
Travis Ralston c88efa5c2c
Merge pull request #3778 from bit/master 
support channel names with slash in name/alias
 2020-01-02 09:19:02 -07:00
Volodymyr Kostyrko 2bfe1e6be3 Translated using Weblate (Ukrainian) 
Currently translated at 28.9% (578 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2020-01-01 11:47:53 +00:00
strix aluco 827ddaf7df Translated using Weblate (Ukrainian) 
Currently translated at 28.6% (572 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2019-12-31 10:47:54 +00:00
catborise 44c181576e Translated using Weblate (Turkish) 
Currently translated at 47.9% (959 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2019-12-31 10:47:52 +00:00
Osoitz d7a680db71 Translated using Weblate (Basque) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-12-31 10:47:49 +00:00
j 9eed423994 support channel names with slash in name/alias 
Signed-off-by: Jan Gerber <j@mailb.org>
 2019-12-29 12:10:31 +01:00
Weblate dc607fbda9 Merge branch 'origin/develop' into Weblate. 2019-12-27 18:37:44 +00:00
Travis Ralston 6ef6b5909f
Merge pull request #3787 from matrix-org/travis/membership-tile 
Fix NPE when filtering the room list
 2019-12-27 11:37:38 -07:00
Travis Ralston 98571d706f Fix NPE when searching for rooms 
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3751
 2019-12-27 11:31:15 -07:00
Weblate 737e049af2 Merge branch 'origin/develop' into Weblate. 2019-12-27 17:19:31 +00:00
Michael Telatynski e9658a9e9e
Merge pull request #3782 from matrix-org/t3chguy/room_settings_alias_input 
Turn RoomAliasField into properly controlled and use in RoomSettings
 2019-12-27 17:19:26 +00:00
Weblate bab89fbfaf Merge branch 'origin/develop' into Weblate. 2019-12-27 17:19:25 +00:00