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

23440 Commits (894968ac71d19c7a0baf2378eac644bcdd303fda)

Author SHA1 Message Date
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
Jeff Huang 5956e9ec6b Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2020-04-16 08:45:02 +00:00
Michael Telatynski 09d4a89561
Merge pull request #4418 from matrix-org/t3chguy/fix_source_url_display 
Fix Message Context Menu options not displaying: block
 2020-04-16 09:44:56 +01:00
Bruno Windels 15075e4c10 load twemoji in matrixclient rather than loggedinview 2020-04-16 10:40:09 +02:00
Michael Telatynski bedffdb8e2 Fix Message Context Menu options not displaying: block 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 01:46:32 +01:00
Travis Ralston b4e2daaf46 Convert cross-signing feature flag to setting 
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
 2020-04-15 13:18:42 -06:00
Michael Telatynski a37ecbbb34
update console.error 2020-04-15 19:24:33 +01:00
Weblate 38762f19ea Merge branch 'origin/develop' into Weblate. 2020-04-15 18:23:34 +00:00
Michael Telatynski 2929bcf998
Merge pull request #4411 from matrix-org/t3chguy/backslash 
Fix pills being broken by unescaped characters
 2020-04-15 19:23:28 +01:00
Weblate 554d2ee54e Merge branch 'origin/develop' into Weblate. 2020-04-15 17:46:27 +00:00
J. Ryan Stinnett 4154acc9dd
Merge pull request #4415 from matrix-org/t3chguy/wait4initialsync 
null-guard MatrixClientPeg in RoomViewStore
 2020-04-15 18:46:23 +01:00
Weblate 5cf187e1cb Merge branch 'origin/develop' into Weblate. 2020-04-15 16:50:44 +00:00
Bruno Windels 09e247b4f8
Merge pull request #4414 from matrix-org/bwindels/fixindexernotifs 
Fix: prevent spurious notifications from indexer
 2020-04-15 16:50:38 +00:00
Michael Telatynski 49e1e6e59f null-guard MatrixClientPeg in RoomViewStore 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 17:31:45 +01:00
Bruno Windels 8c2c777e2b disable reemitting on the client for events mapped from the indexer 2020-04-15 17:37:32 +02:00
Weblate 74bcb95505 Merge branch 'origin/develop' into Weblate. 2020-04-15 15:17:22 +00:00
Valex 6d60784122 Translated using Weblate (Russian) 
Currently translated at 90.3% (2065 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-04-15 15:17:21 +00:00
Michael Telatynski f4c4fe7d12
Merge pull request #4413 from matrix-org/t3chguy/wait4initialsync 
Login block on initialSync with spinners
 2020-04-15 16:17:13 +01:00
Michael Telatynski 81f501e844 disable language dropdown too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 14:19:47 +01:00
Weblate 2ff0521f24 Merge branch 'origin/develop' into Weblate. 2020-04-15 13:08:39 +00:00