Commit Graph

23270 Commits (84552048e6bccad06cace707415cf882061ff908)

Author SHA1 Message Date
Bruno Windels 84552048e6
Merge pull request #4457 from matrix-org/bwindels/waitforxsignkeystoverify-rc
Fix: wait until cross-signing keys are fetched to show verify button
2020-04-22 08:12:52 +00:00
Bruno Windels d842944f61 wait until cross-signing keys are fetched to show verify button 2020-04-21 18:42:09 +02:00
David Baker c244d75fcb
Merge pull request #4454 from matrix-org/dbkr/create_secret_storage_handle_load_error_rel
Handle load error in create secret storage dialog
2020-04-21 10:43:40 +01:00
David Baker 39b3675583 Handle load error in create secret storage dialog 2020-04-21 10:24:04 +01:00
David Baker 13cb49bb0d Don't recheck DeviceListener until after initial sync is finished
Each recheck caused a GET to account data to see if the master key
exists if done before the initial sync, which is unnecessary here.
This just makes it wait until the initial sync is done to recheck.

Fixes https://github.com/vector-im/riot-web/issues/13279
2020-04-20 15:23:07 +01:00
J. Ryan Stinnett 54c1ae8322
Merge pull request #4447 from matrix-org/t3chguy/poljar/cherry-pick1
EventIndex: Filter out events that don't have a propper content value.
2020-04-20 10:09:26 +01:00
Damir Jelić 212c3ca46c EventIndex: Add a missing semicolon.
(cherry picked from commit 3781bdc975)
2020-04-20 10:00:49 +01:00
Damir Jelić 161203d445 EventIndex: Filter out events that don't have a propper content value.
(cherry picked from commit 6084c08f34)
2020-04-20 10:00:48 +01:00
RiotRobot 1ee2d6f3a2 v2.5.0-rc.3 2020-04-17 17:51:49 +01:00
RiotRobot 12f2076e34 Prepare changelog for v2.5.0-rc.3 2020-04-17 17:51:49 +01:00
RiotRobot 383915d5cc Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:46:55 +01:00
RiotRobot 23f167d681 v2.5.0-rc.2 2020-04-16 20:01:46 +01:00
RiotRobot c7e908ddc0 Prepare changelog for v2.5.0-rc.2 2020-04-16 20:01:46 +01:00
RiotRobot c6746e68b2 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 19:56:11 +01:00
Travis Ralston 4e7dd74c22
Merge pull request #4429 from matrix-org/travis/xsign-flag-rel
[Release] Convert cross-signing flag to a setting
2020-04-16 12:50:54 -06:00
Travis Ralston 22533d3e6a Disable scripts in CI too 2020-04-16 12:46:34 -06:00
Travis Ralston c3f90ed289 Short-circuit all end to end tests 2020-04-16 12:42:42 -06:00
Travis Ralston 741368350c Track the issue number too 2020-04-16 12:42:32 -06:00
Travis Ralston 8b5a8f163f Disable e2e tests for now 2020-04-16 12:23:22 -06:00
Travis Ralston 2451e0b873 Wait a bit before continuing with the passphrase
The continue button is probably no-oping due to being disabled.
2020-04-16 12:13:35 -06:00
Travis Ralston 597f97e1d8 Select the right continue button
There's no buttons in the field.
2020-04-16 12:04:01 -06:00
Travis Ralston 2432f77b72 Blind attempt at fixing the end to end tests 2020-04-16 11:48:45 -06:00
Travis Ralston 45b6b95d44 Appease the linter 2020-04-16 11:27:09 -06:00
Travis Ralston 2ffb5be5cd Remove UI to change the cross-signing setting 2020-04-16 11:26:56 -06:00
Travis Ralston b5b4bdbf3d Clean up setting definition to follow surrounding practices
It's not perfect, but we're at least okay with it.
2020-04-16 11:26:51 -06:00
Travis Ralston 2d395d8dd1 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-16 11:26:42 -06:00
J. Ryan Stinnett c81c209d7b
Merge pull request #4426 from matrix-org/jryans/cross-signing-copy-release
Iterate cross-signing copy
2020-04-16 16:01:31 +01:00
Michael Telatynski 7593c8273b update PHASE_PASSPHRASE copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
Michael Telatynski d4b15da70a Fixxy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
Michael Telatynski 14910c6e80 iterate copy some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
Michael Telatynski 84e8e22616 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
Michael Telatynski 0e72aef1e3 update Create SSSS Dialog copy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
Michael Telatynski da5c8b5657 further tweaks by Matthew
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
Michael Telatynski 7236397e5f Replace `Verify this session` and `Complete security`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
Michael Telatynski 498ac2e0fc Copy tweaks with Nad
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
Michael Telatynski d17e54c1cf Use `recovery passphrase` and `recovery key` everywhere
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
Bruno Windels d6c0958490
Merge pull request #4423 from matrix-org/bwindels/loadtwemojiforsas-rc
Fix: ensure twemoji font is loaded when showing SAS emojis
2020-04-16 11:34:27 +00:00
Bruno Windels 6723cca48e ensure twemoji font is loaded when showing SAS emojis 2020-04-16 11:36:57 +02:00
RiotRobot 6ee09cd688 v2.5.0-rc.1 2020-04-15 19:18:45 +01:00
RiotRobot e2fb96776b Prepare changelog for v2.5.0-rc.1 2020-04-15 19:18:45 +01:00
RiotRobot 5022eaf483 Upgrade matrix-js-sdk to 5.3.1-rc.1 2020-04-15 19:13:00 +01:00
RiotRobot a054ea0653 Merge branch 'release-v2.4.0' into release-v2.5.0 2020-04-15 19:07:11 +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