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

18650 commits

Author SHA1 Message Date
Travis Ralston
d910eb4d57 Merge branch 'develop' into thobyv/make-filepanel-remember-scroll-position 2020-04-17 15:10:12 -06:00
Michael Telatynski
29028844f9
Merge pull request #4435 from matrix-org/t3chguy/typo1 
Fix typo
 2020-04-17 16:47:27 +01:00
Michael Telatynski
518639e8b1 Fix typo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-17 16:04:38 +01:00
Zoe
e3d784816d Merge branch 'develop' into foldleft/better-errors 2020-04-17 14:11:05 +01:00
Michael Telatynski
66de06c7b9
Merge pull request #4381 from matrix-org/t3chguy/rageshake_incompatible_browser 
Rageshake: remind user of unsupported browser and send modernizr report
 2020-04-17 13:14:40 +01:00
Michael Telatynski
cd65bdc799 Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot 
 Conflicts:
	src/components/views/rooms/RoomBreadcrumbs.js
	src/components/views/rooms/RoomTile.js
 2020-04-17 12:58:54 +01:00
Michael Telatynski
81c7660bf5 Iterate copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-17 12:25:16 +01:00
Travis Ralston
a5f5f759cb Create unencrypted rooms by default in e2e-tests 
Otherwise the lazy loading test will try to join the room after the encrypted messages have already been sent, making them invisible. 

See https://github.com/vector-im/riot-web/issues/13226#issuecomment-614928362
 2020-04-16 16:27:43 -06: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
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
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
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
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
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
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
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
Bruno Windels
15075e4c10 load twemoji in matrixclient rather than loggedinview 2020-04-16 10:40:09 +02: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
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
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
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
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
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
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