OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
20,546 Commits
212 Branches
549 Tags
667 MiB
Commit Graph

20546 Commits (5e4dab1f151422fa7220c766bfb13752ba06a1dc)

Author SHA1 Message Date
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
Half-Shot 50e19ba43d User may not be a bot, therefore do not imply it. 2020-01-03 14:04:59 +00:00
Half-Shot 831053de11 Make bridge info cards more obvious 2020-01-03 13:58:07 +00:00
Half-Shot 668479d94a Tweak as per git review 2020-01-03 13:57:59 +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
Travis Ralston 6f1525c1f3 Appease the scss linter 2020-01-02 17:47:26 -07:00
Travis Ralston 3488eaba3c Appease the linter 2020-01-02 17:44:19 -07:00
Travis Ralston 4de0f7257a Initial implementation of FTUE user lists design 
This covers the "recents" section and rough design exclusively. It is known that the Field does nothing and that there's a bunch of missing functionality - this is to be iterated upon in future PRs. Labs flag is to aide development and should be removed in a very near future PR.

Also, this is focusing on DMs and not user lists in general because I misinterpreted the scope. I'll fix this in a future PR and instead make this the best DM invite dialog it can be.

Closes https://github.com/vector-im/riot-web/issues/11197
 2020-01-02 17:40:18 -07: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
Will Hunt fa9fd97a4e
missing } 2020-01-02 09:41:50 +00: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
Will Hunt fb94be4abd
No trailing space 2019-12-30 16:11:59 +00:00
Will Hunt 0a8cc416bf
Merge branch 'develop' into hs/bridge-info 2019-12-30 17:09:05 +01:00
Will Hunt b1c2887087
line length 2019-12-30 16:08:24 +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
Justin Sleep d0b8565f54 Fix inverted diff line highlighting in dark theme 
Signed-off-by: Justin Sleep <justin@midnightmechanism.com>
 2019-12-28 23:56:44 -06:00
Michael Telatynski 4489b5a21a Escape HTML in og:description and render any html &-encoded entities 2019-12-28 20:05:55 +00:00
Michael Telatynski 705bfcd20d fix RoomViewStore import in UserInfo 2019-12-28 17:54:46 +00:00
Michael Telatynski a0cb6ce302 User Info fetch latest RoomMember instead of showing historical data 2019-12-28 17:51:38 +00:00
Travis Ralston 3a7c5dc241
Merge pull request #3760 from matrix-org/travis/babel7-wp-flex 
Use `flex-start` instead of `start` for postcss
 2019-12-27 12:05:50 -07: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
random 957b1efc00 Translated using Weblate (Italian) 
Currently translated at 99.9% (2000 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-12-27 17:19:25 +00:00