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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|