PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
23681 commits 1 branch 0 tags 338 MiB
Commit graph

23681 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Telatynski
7efbae0470
Merge pull request #4408 from matrix-org/t3chguy/fix_network_dropdown_scrolling 
Allow network dropdown to be scrollable and fix context menu padding calc
 2020-04-15 14:08:34 +01:00
Michael Telatynski
ac26719b69 disable password reset button when spinning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 14:07:37 +01:00
Weblate
b7caf93cd5 Merge branch 'origin/develop' into Weblate. 2020-04-15 13:07:30 +00:00
random
357dc504f5 Translated using Weblate (Italian) 
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-04-15 13:07:29 +00:00
Kévin C
ebef7a2167 Translated using Weblate (French) 
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-04-15 13:07:29 +00:00
Jeff Huang
08d56e55d4 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-04-15 13:07:28 +00:00
J. Ryan Stinnett
fafe57624c
Merge pull request #4412 from matrix-org/jryans/hide-e2e-info-opt 
Remove end-to-end message info option when cross-signing is used
 2020-04-15 14:07:22 +01:00
Michael Telatynski
8b25223026 fix onLoggedIn getting called twice 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 13:45:12 +01:00
Michael Telatynski
76ce4081cb i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 12:31:27 +01:00
Michael Telatynski
346b2e8588 Login block on initialSync with spinners 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 12:21:49 +01:00
J. Ryan Stinnett
e9c755e73f Remove end-to-end message info option when cross-signing is used 
This end-to-end info dialog repeats info available elsewhere and has not been
updated to make sense for cross-signing, triggers old verification methods, etc.
For now, this hides the option to present a more consistent UI.

Relates to https://github.com/vector-im/riot-web/issues/11752
 2020-04-15 10:25:05 +01:00
Michael Telatynski
9c1939b756 match all, not just first instance of tokens to escape 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 02:31:30 +01:00
Michael Telatynski
4454db30d6 Escape opening square bracket too 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 01:02:08 +01:00
Michael Telatynski
cb10640eaf detslint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 00:53:35 +01:00
Michael Telatynski
f1def8b0de delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 00:50:28 +01:00
Michael Telatynski
c72139fc3f Convert serialize and deserialize to TypeScript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 00:49:08 +01:00