OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
22,890 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

22890 Commits (86f39ee0eee2e18e86b3e92b2b7d8c0a56da9bdd)

Author SHA1 Message Date
Bruno Windels 7b1b4cda14 ensure local state for aliases doesn't get garbled up 
when removing another alias before the response of the first comes back
 2020-03-17 20:37:44 +01:00
Weblate 79eee11673 Merge branch 'origin/develop' into Weblate. 2020-03-17 19:06:46 +00:00
Travis Ralston 1453120c66
Merge pull request #4208 from matrix-org/matthew/jump-to-bottom-ublock 
Rename 'jump to bottom' to avoid ublock block
 2020-03-17 13:06:41 -06:00
Aaron Raimist 038888f2d4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into mac-redo 2020-03-17 13:52:43 -05:00
Aaron Raimist 84a8ca6982
Fix typo 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-03-17 13:18:27 -05:00
Matthew Hodgson af023a2d7c rename 'jump to bottom' to avoid ublock block 2020-03-17 11:15:57 -06:00
Weblate 6b45cdf51e Merge branch 'origin/develop' into Weblate. 2020-03-17 16:47:23 +00:00
J. Ryan Stinnett fac4561ac8
Merge pull request #4225 from matrix-org/jryans/comp-sec-restore-slow 
Restore key backup in background after complete security
 2020-03-17 16:47:18 +00:00
Weblate 6e4b1f9431 Merge branch 'origin/develop' into Weblate. 2020-03-17 16:46:59 +00:00
J. Ryan Stinnett e51a7f3ca4
Merge pull request #4223 from matrix-org/jryans/key-backup-text-xsign 
Fix key backup trust text for cross-signing
 2020-03-17 16:46:53 +00:00
Weblate 905b8b466e Merge branch 'origin/develop' into Weblate. 2020-03-17 14:25:54 +00:00
RiotRobot b09c063d1b Reset matrix-js-sdk back to develop branch 2020-03-17 14:25:44 +00:00
Weblate 52b4876189 Merge branch 'origin/develop' into Weblate. 2020-03-17 14:25:00 +00:00
Besnik Bleta 51012702f2 Translated using Weblate (Albanian) 
Currently translated at 99.3% (2141 of 2157 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-17 14:24:59 +00:00
RiotRobot 8e8723bb36 Merge branch 'master' into develop 2020-03-17 14:24:35 +00:00
RiotRobot a92fe9f846 Merge branch 'release-v2.2.3' 2020-03-17 14:21:35 +00:00
RiotRobot 1e3b917aed v2.2.3 2020-03-17 14:18:15 +00:00
RiotRobot 5b96408bc5 Prepare changelog for v2.2.3 2020-03-17 14:18:14 +00:00
RiotRobot 83b6155637 Upgrade matrix-js-sdk to 5.1.1 2020-03-17 14:12:15 +00:00
Michael Telatynski 638629c2fa fix MyGroups scrollbar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-17 13:28:07 +00:00
David Baker d72ce28a27 Merge branch 'uhoreg/symmetric-ssss-migrate' of git://github.com/uhoreg/matrix-react-sdk into uhoreg-uhoreg/symmetric-ssss-migrate 2020-03-17 13:12:05 +00:00
J. Ryan Stinnett 6e90498739
Merge pull request #4228 from matrix-org/jryans/hide-video-config-release 
Add default on config setting to control call button in composer
 2020-03-17 11:56:44 +00:00
Weblate 9fe8606e01 Merge branch 'origin/develop' into Weblate. 2020-03-17 11:56:40 +00:00
J. Ryan Stinnett 93b8dee33c
Merge pull request #4227 from matrix-org/jryans/hide-video-config 
Add default on config setting to control call button in composer
 2020-03-17 11:56:34 +00:00
Michael Telatynski 8fd3b96b72 fix styling/heights 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-17 11:53:19 +00:00
Zoe ea99eebb7b Report to the user when a key signature upload fails 2020-03-17 11:45:27 +00:00
J. Ryan Stinnett ec4e81de74 Add default on config setting to control call button in composer 
This adds a default on setting that can be used to control whether call buttons
are shown in the composer via `settingDefaults` in config.json. No UI is added
to control it for now.

Fixes https://github.com/vector-im/riot-web/issues/12758
 2020-03-17 11:43:03 +00:00
J. Ryan Stinnett 59b1cbd4b2 Add default on config setting to control call button in composer 
This adds a default on setting that can be used to control whether call buttons
are shown in the composer via `settingDefaults` in config.json. No UI is added
to control it for now.

Fixes https://github.com/vector-im/riot-web/issues/12758
 2020-03-17 11:33:10 +00:00
Weblate 4bbcb485f6 Merge branch 'origin/develop' into Weblate. 2020-03-17 10:55:42 +00:00
Bruno Windels e8c77543f9
Merge pull request #4221 from matrix-org/bwindels/aliaslipstick 
Fix: make alternative addresses UX less confusing
 2020-03-17 10:55:36 +00:00
J. Ryan Stinnett e400950a6c
Merge pull request #4226 from matrix-org/bwindels/aliaslipstick-release 
Fix: make alternative addresses UX less confusing
 2020-03-17 10:53:12 +00:00
Bruno Windels 663ccb7796 run i18n 2020-03-17 11:48:31 +01:00
Bruno Windels 26f2bcd073 Update src/components/views/room_settings/AliasSettings.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-03-17 11:48:31 +01:00
Bruno Windels 048d3f0e42 fix style lint 2020-03-17 11:48:31 +01:00
Bruno Windels dd19f27964 more margin between published and local addresses 2020-03-17 11:48:31 +01:00
Bruno Windels a591e5016f tweak labels, etc 2020-03-17 11:48:31 +01:00
Bruno Windels 5537e6dcd4 change <details> appearance for local aliases 2020-03-17 11:48:31 +01:00
Bruno Windels 42ff9f2c9e make editable list look like something closer to design 2020-03-17 11:48:31 +01:00
Bruno Windels cb271fe027 avoid double margin-right for toggle 2020-03-17 11:48:31 +01:00
Bruno Windels 76b7194a4f add headers and copy to lessen confusion of new alias workings 2020-03-17 11:48:31 +01:00
Bruno Windels 57b2dd92f5 move room publish toggle below canonical alias 
also to own component to not contaminate alias settings too much
with this
 2020-03-17 11:48:31 +01:00
Bruno Windels 010661249b run i18n 2020-03-17 11:47:56 +01:00
Bruno Windels 1f4e92885b
Update src/components/views/room_settings/AliasSettings.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-03-17 10:43:01 +00:00
Weblate 65f4856f28 Merge branch 'origin/develop' into Weblate. 2020-03-17 10:32:32 +00:00
David Baker 5de93d0fee
Merge pull request #4222 from matrix-org/dbkr/wait_for_verify 
Wait for verification request on login
 2020-03-17 10:32:26 +00:00
Weblate 6d525baf5e Merge branch 'origin/develop' into Weblate. 2020-03-17 10:32:26 +00:00
Mejans 2ef53cb50a Translated using Weblate (Occitan) 
Currently translated at 2.2% (48 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/oc/
 2020-03-17 10:32:26 +00:00
call_xz e3ce197145 Translated using Weblate (Japanese) 
Currently translated at 56.5% (1216 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-03-17 10:32:23 +00:00
Tirifto 76703d99f5 Translated using Weblate (Esperanto) 
Currently translated at 99.8% (2148 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-03-17 10:32:23 +00:00
Michael Telatynski 44b0aa2d88 Remove remainders of gemini-scrollbar and react-gemini-scrollbar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-17 10:31:45 +00:00