Commit Graph

23364 Commits (ab82bf80484e69abff75ff2fcebd8f795f062852)

Author SHA1 Message Date
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
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
Travis Ralston 36fea4d487
Merge pull request #4378 from matrix-org/travis/expanding-widgets
Minimize widgets by default
2020-04-14 12:56:10 -06:00