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

22716 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Telatynski
8dfc15a328 Migrate TagPanel away from Gemini 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-17 10:23:12 +00:00
Michael Telatynski
43f0013dda Migrate GroupView away from Gemini 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-17 10:09:47 +00:00
Damir Jelić
997a179e69 Merge branch 'poljar/shutdown' into develop 2020-03-17 10:15:12 +01:00
Damir Jelić
029624cbec Merge branch 'poljar/delete-events' into develop 2020-03-17 10:15:05 +01:00
J. Ryan Stinnett
c245c6932c Restore key backup in background after complete security 
We were blocking the complete security flow on waiting for a key backup restore
to complete, which could take multiple minutes with no visible progress.

Fixes https://github.com/vector-im/riot-web/issues/12426
 2020-03-16 23:30:24 +00:00
Hubert Chathi
f7dddfc1a7 show encryption upgrade when SSSS needs upgrading 2020-03-16 17:31:26 -04:00
Hubert Chathi
7b6a78bfb8 don't check public key if there is none 2020-03-16 17:31:06 -04:00
Mejans
d30618fe0e Added translation using Weblate (Occitan) 2020-03-16 20:14:10 +00:00
J. Ryan Stinnett
cc27894fc9 Fix key backup trust text for cross-signing 
This fixes the key backup panel to use the correct object when checking whether
a device is verified or unverified via cross-signing trust.
 2020-03-16 18:59:07 +00:00
David Baker
6c8bfe3293 Lint 2020-03-16 17:58:37 +00:00
David Baker
6c4b572c7e Wait for verification request on login 
Basically just changes to the designed screen to wait for an incoming
verification request in order to verify the device & cross-sign it.

Fixes https://github.com/vector-im/riot-web/issues/11215
Fixes https://github.com/vector-im/riot-web/issues/11217
 2020-03-16 17:47:56 +00:00
Bruno Windels
351398ada9 fix style lint 2020-03-16 18:34:09 +01:00
Bruno Windels
3253d0b93d more margin between published and local addresses 2020-03-16 18:30:40 +01:00
Bruno Windels
d6ddc5096f tweak labels, etc 2020-03-16 18:25:13 +01:00
Bruno Windels
78fb95aa9e change <details> appearance for local aliases 2020-03-16 18:24:49 +01:00
Bruno Windels
db10fcd2b7 make editable list look like something closer to design 2020-03-16 17:29:35 +01:00
Bruno Windels
f7eecc0921 avoid double margin-right for toggle 2020-03-16 17:29:15 +01:00
Bruno Windels
31cb257eb9 add headers and copy to lessen confusion of new alias workings 2020-03-16 17:28:45 +01:00
Bruno Windels
26f6203985 move room publish toggle below canonical alias 
also to own component to not contaminate alias settings too much
with this
 2020-03-16 17:27:06 +01:00
Weblate
c995de7951 Merge branch 'origin/develop' into Weblate. 2020-03-16 15:49:37 +00:00
Jan Renz
639f20e37a Translated using Weblate (German) 
Currently translated at 77.6% (1669 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-16 15:49:37 +00:00
Michael Albert
5d5d28df40 Translated using Weblate (German) 
Currently translated at 77.6% (1669 of 2152 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-16 15:49:34 +00:00
Damir Jelić
a7d6b9e48e Merge branch 'poljar/seshat-403-checkpoint' into develop 2020-03-16 16:48:24 +01:00