OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
23,345 Commits
211 Branches
549 Tags
664 MiB
Commit Graph

23345 Commits (0489f10cf59c3d9428ce38211ed0d5f79dbd6097)

Author SHA1 Message Date
aWeinzierl 0489f10cf5 Translated using Weblate (German) 
Currently translated at 75.9% (1738 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:34:05 +00:00
alexsal86 686dc2d7ac Translated using Weblate (German) 
Currently translated at 75.4% (1726 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:24:23 +00:00
aWeinzierl bf63fd2b50 Translated using Weblate (German) 
Currently translated at 75.4% (1726 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-17 00:24:23 +00:00
Weblate 2863d45f4c Merge branch 'origin/develop' into Weblate. 2020-04-16 20:14:45 +00:00
Szimszon a81f3f6d19 Translated using Weblate (Hungarian) 
Currently translated at 98.3% (2251 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-04-16 20:14:44 +00:00
Øjvind Fritjof Arnfred cb5b5fddbe Translated using Weblate (Danish) 
Currently translated at 22.6% (517 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2020-04-16 20:14:44 +00:00
David Baker 3d99125ced
Merge pull request #4431 from matrix-org/dbkr/fix_key_backup_stored_debug 
Fix key backup debug panel
 2020-04-16 21:14:37 +01:00
David Baker 9e18dbc0dc Fix key backup debug panel 
The type changed so it thought it was not stored when it was
 2020-04-16 21:08:14 +01:00
Weblate 72e8281bd8 Merge branch 'origin/develop' into Weblate. 2020-04-16 18:51:43 +00:00
Travis Ralston cd73f3736a
Merge pull request #4416 from matrix-org/travis/cross-sign-setting 
Convert cross-signing feature flag to setting
 2020-04-16 12:51:38 -06:00
Travis Ralston 3614170906 Disable scripts in CI too 2020-04-16 12:47:25 -06:00
Travis Ralston 1deece3fb5 Short-circuit all end to end tests 2020-04-16 12:41:48 -06:00
Travis Ralston 4af33d91eb Track the issue number too 2020-04-16 12:26:08 -06:00
Travis Ralston d04af1f3a8 Disable e2e tests for now 2020-04-16 12:24:04 -06:00
Travis Ralston f4a5361b14 Wait a bit before continuing with the passphrase 
The continue button is probably no-oping due to being disabled.
 2020-04-16 12:13:05 -06:00
Travis Ralston 5769b07a92 Select the right continue button 
There's no buttons in the field.
 2020-04-16 12:04:48 -06:00
Travis Ralston 25fa675f88 Blind attempt at fixing the end to end tests 2020-04-16 11:46:29 -06:00
Travis Ralston 0fcaaab1d0 Appease the linter 2020-04-16 11:18:54 -06:00
Travis Ralston 54f8ba4d80 Remove UI to change the cross-signing setting 2020-04-16 11:15:12 -06:00
Travis Ralston b5130ca5dc Clean up setting definition to follow surrounding practices 
It's not perfect, but we're at least okay with it.
 2020-04-16 11:12:47 -06:00
Travis Ralston db749519e7 Merge branch 'develop' into travis/cross-sign-setting 2020-04-16 11:06:26 -06:00
Weblate 054098bb81 Merge branch 'origin/develop' into Weblate. 2020-04-16 16:26:09 +00:00
Besnik Bleta 65f1f7cfad Translated using Weblate (Albanian) 
Currently translated at 99.7% (2282 of 2289 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-04-16 16:26:09 +00:00
Michael Telatynski aa5573694e
Merge pull request #4428 from matrix-org/t3chguy/kegan_1 
Make RoomPublishSetting import-skinnable
 2020-04-16 17:26:01 +01:00
Michael Telatynski e1e65a0fe1 Make RoomPublishSetting import-skinnable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 17:13:33 +01:00
Weblate 7127cdb27d Merge branch 'origin/develop' into Weblate. 2020-04-16 14:31:42 +00:00
rkfg 765205869a Translated using Weblate (Russian) 
Currently translated at 90.1% (2065 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-16 14:31:42 +00:00
random 9de8adc7af Translated using Weblate (Italian) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-04-16 14:31:42 +00:00
J. Ryan Stinnett 94ace258f3
Merge pull request #4425 from matrix-org/t3chguy/recovery_copy 
Iterate cross-signing copy
 2020-04-16 15:31:35 +01:00
Michael Telatynski aea7ede7d0 update PHASE_PASSPHRASE copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 14:55:43 +01:00
Michael Telatynski e942a35525 Fixxy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 14:09:41 +01:00
Michael Telatynski af59c1b5b3 iterate copy some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 14:02:32 +01:00
Michael Telatynski 8c8509a603 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 13:48:52 +01:00
Michael Telatynski 9ec8fda1ce update Create SSSS Dialog copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 13:34:18 +01:00
Michael Telatynski ce78e3b8d8 further tweaks by Matthew 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 13:28:12 +01:00
Michael Telatynski 1fb0f39c84 Replace `Verify this session` and `Complete security` 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 13:23:01 +01:00
Michael Telatynski f65c31383d Copy tweaks with Nad 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 12:52:35 +01:00
Weblate a3d149d180 Merge branch 'origin/develop' into Weblate. 2020-04-16 11:34:07 +00:00
Bruno Windels 0b7f7820c2
Merge pull request #4422 from matrix-org/bwindels/loadtwemojiforsas 
Fix: ensure twemoji font is loaded when showing SAS emojis
 2020-04-16 11:34:01 +00:00
Michael Telatynski a9a2999ccc Use `recovery passphrase` and `recovery key` everywhere 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 12:26:12 +01:00
Bruno Windels 3933c4c31c ensure twemoji font is loaded when showing SAS emojis 2020-04-16 11:35:54 +02:00
Weblate a383188b7e Merge branch 'origin/develop' into Weblate. 2020-04-16 09:26:11 +00:00
Bruno Windels 4a2e13c227
Merge pull request #4421 from matrix-org/revert-4419-bwindels/loadtwemojiearlier 
Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS"
 2020-04-16 09:26:06 +00:00
Bruno Windels 33391a3110
Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS" 2020-04-16 09:25:18 +00:00
Weblate 7c4bcb1df3 Merge branch 'origin/develop' into Weblate. 2020-04-16 09:15:29 +00:00
Bruno Windels c396950ca4
Merge pull request #4419 from matrix-org/bwindels/loadtwemojiearlier 
Fix: load Twemoji before login so complete security gets the right emojis during SAS
 2020-04-16 09:15:24 +00:00
Weblate 54bb76457f Merge branch 'origin/develop' into Weblate. 2020-04-16 08:47:30 +00:00
Michael Telatynski 135cecbd4f
Merge pull request #4410 from matrix-org/t3chguy/copy 
consolidate and fix copy to clipboard
 2020-04-16 09:47:24 +01:00
Weblate 2e3fd5aded Merge branch 'origin/develop' into Weblate. 2020-04-16 08:45:02 +00:00
Kévin C bc48d012b8 Translated using Weblate (French) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-04-16 08:45:02 +00:00