Commit Graph

22124 Commits (f22554e99a4e4fe42f130653c61bbdb03874d8d4)

Author SHA1 Message Date
Bruno Windels f22554e99a
Merge pull request #4194 from matrix-org/bwindels/enable4sonverify
Enable 4S if needed when trying to verify or accepting verification
2020-03-10 18:03:02 +00:00
Bruno Windels 1eb5bdf847 use USK as we'll only have that around when using key sharing 2020-03-10 18:40:24 +01:00
Travis Ralston f33c930c41 Revert "Merge pull request #3892 from krkc/move-read-receipts-to-bottom"
This reverts commit 191abb5b0d.
2020-03-10 11:28:52 -06:00
Travis Ralston a808b05026
Merge pull request #4193 from MarcoZehe/FixExtraneousTabStopOnTree
Remove extraneous tab stop from room tree view.
2020-03-10 09:59:44 -06:00
Bruno Windels e34a37102a move i18n strings around as script desires 2020-03-10 16:56:20 +01:00
Bruno Windels ab2e3a3465 also enable 4s when accepting a verification request 2020-03-10 16:54:49 +01:00
Bruno Windels ddbfe4e1fa enable 4S if needed when trying to verify 2020-03-10 16:31:40 +01:00
Travis Ralston 9b62cc964b
Merge pull request #4191 from matrix-org/travis/remove-v1-identity
Remove v1 identity server fallbacks
2020-03-10 09:30:24 -06:00
Marco Zehe 3bff5c55cf Remove extraneous tab stop from room tree view.
This was introduced some time ago when the room list became scrollable. Divs with overflow:scroll; become focusable for the keyboard in Firefox, but since we have keyboard handling for the whole compound widget, we don't need that tab stop on the tree view container div. Putting tabindex="-1" on it fixes it.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
2020-03-10 16:24:42 +01:00
Bruno Windels c5e62ec0ef
Merge pull request #4187 from matrix-org/bwindels/altaliases
Allow editing of alt_aliases according to MSC2432
2020-03-10 12:45:16 +00:00
Bruno Windels db9895f223
Merge pull request #4189 from matrix-org/bwindels/aliasesintimeline
Update timeline rendering of aliases
2020-03-10 12:43:14 +00:00
J. Ryan Stinnett b64faad4e5
Merge pull request #4190 from matrix-org/jryans/mark-as-read-dark
Fix mark as read button for dark theme
2020-03-10 10:04:32 +00:00
Travis Ralston 4cdfda3c7d Remove v1 identity server fallbacks
For https://github.com/vector-im/riot-web/issues/10443
2020-03-09 17:05:13 -06:00
J. Ryan Stinnett c541bc0705 Fix mark as read button for dark theme
This changes the mark as read button to a mask image so that it can be themed
like other images.

Fixes https://github.com/vector-im/riot-web/issues/12640
2020-03-09 17:34:17 +00:00
Bruno Windels 378939bed7 add timeline text descriptions for modifying alt_aliases 2020-03-09 18:24:48 +01:00
Bruno Windels 0d8b4ac194 remove timeline tiles for m.room.aliases events 2020-03-09 18:23:32 +01:00
David Baker b1ad0b8d77
Merge pull request #4188 from matrix-org/dbkr/remove_version_link
Un-linkify version in settings
2020-03-09 16:27:07 +00:00
David Baker 650d3d0e2d Un-linkify version in settings
Probably a bit confusing while our changelogs are mostly in react-sdk,
and ended up linking to version 0.0.0 in nightly builds.
2020-03-09 16:17:25 +00:00
J. Ryan Stinnett d2cd64d9d3
Merge pull request #4186 from matrix-org/jryans/mjolnir-stop
Make Mjolnir stop more robust
2020-03-09 16:15:32 +00:00
Bruno Windels 5eaf03c3da update e2e tests to expand local aliases when adding one 2020-03-09 17:03:50 +01:00
Bruno Windels 9961f810f1 update i18n 2020-03-09 16:54:00 +01:00
Bruno Windels 8ee714f86d show hand cursor over summary 2020-03-09 16:50:48 +01:00
Bruno Windels dcbbf31f04 fix lint 2020-03-09 16:50:34 +01:00
Bruno Windels f7cb633e3d only load local aliases on mount when you can edit the canonical alias 2020-03-09 16:43:52 +01:00
Bruno Windels 053ba1110a make pressing enter not reload riot when editable list is in form 2020-03-09 16:32:31 +01:00
Bruno Windels 7079d70f18 hide local aliases by default 2020-03-09 16:32:13 +01:00
Bruno Windels 08a31886a7 make domain postfix optional (not needed for alt aliases) 2020-03-09 16:31:30 +01:00
Bruno Windels eb539537f2 add recommendations for alt aliases 2020-03-09 16:31:07 +01:00
Bruno Windels 38e99f3a68 add editable list for alt aliases 2020-03-09 16:29:04 +01:00
Bruno Windels ee9558cb0b change state from domainToAliases to local and alt aliases 2020-03-09 16:28:33 +01:00
J. Ryan Stinnett c425d7f02f Make Mjolnir stop more robust
Since Mjolnir is a shared instance, we need to be a bit more careful about
clearing internal state than we do for components. This clears watcher and
dispatcher refs in case `stop` is called multiple times (which can happen in
prod as well as tests).
2020-03-09 15:24:56 +00:00
J. Ryan Stinnett 769f1f4e00
Merge pull request #4185 from matrix-org/jryans/sharing-names
Fix secret sharing names to match spec
2020-03-09 13:48:11 +00:00
J. Ryan Stinnett 47b1552ccc Fix secret sharing names to match spec
When sharing keys, we should use `m.cross_signing` prefix.

Part of https://github.com/vector-im/riot-web/issues/12661
2020-03-09 13:36:02 +00:00
Zoe 49fe1887df
Merge pull request #4172 from matrix-org/foldleft/secret-requests
Share secrets with another device on request
2020-03-09 09:55:38 +00:00
Bruno Windels 1e95048018
Merge pull request #4181 from matrix-org/bwindels/bringbacklegacyverififnoxsignkeys
Fall back to to_device verification if other user hasn't uploaded cross-signing keys
2020-03-09 08:35:13 +00:00
Travis Ralston 1530c91772
Merge pull request #4182 from matrix-org/travis/edit-redactions
Disable edits on redacted events
2020-03-06 14:34:57 -07:00
Travis Ralston e4d323d2f2 Disable edits on redacted events
Fixes https://github.com/vector-im/riot-web/issues/12633
2020-03-06 14:23:20 -07:00
Bruno Windels 4fd1d8a5e7
Merge pull request #4180 from matrix-org/bwindels/toastwithoutxsign
Use crypto.verification.request even when xsign is disabled
2020-03-06 16:47:17 +00:00
Bruno Windels b312e73510 Merge branch 'bwindels/toastwithoutxsign' into bwindels/bringbacklegacyverififnoxsignkeys 2020-03-06 17:44:23 +01:00
Bruno Windels 1f9bd55f3b revert to legacy user verification (over to_device) without xsign keys 2020-03-06 17:37:01 +01:00
Bruno Windels b0617f10e8 stick to IncomingSasDialog as VerificationRequestDialog doesn't show sender yet, makes e2e tests fail 2020-03-06 17:22:56 +01:00
Bruno Windels f8ef5bb6a5 check .started first as it can be both .started and pending 2020-03-06 17:20:08 +01:00
Bruno Windels a7de575316 use crypto.verification.request even when xsign is disabled 2020-03-06 16:50:39 +01:00
Damir Jelić 69389823f7 ManageEventIndexDialog: Reword and move the crawler state around a bit.
This reflects now the latests design on Figma.
2020-03-06 16:07:10 +01:00
Damir Jelić 364899b27d ManageEventIndexDialog: Show how many rooms are done instead being processed. 2020-03-06 15:44:23 +01:00
Damir Jelić bff3f3e632 Revert "ManageEventIndexDialog: Reword the status for the currently indexing rooms."
This reverts commit 7d6569a0b87c48733dbddec3c2662325977d0234.
2020-03-06 15:44:23 +01:00
Damir Jelić 8fe54e5dca ManageEventIndexDialog: Reword the status for the currently indexing rooms. 2020-03-06 15:44:23 +01:00
Travis Ralston 191abb5b0d
Merge pull request #3892 from krkc/move-read-receipts-to-bottom
Moved read receipts to the bottom of the EventTile.
2020-03-05 17:24:51 -07:00
Travis Ralston 1975a8e082 Merge branch 'develop' into move-read-receipts-to-bottom 2020-03-05 17:13:24 -07:00
Travis Ralston 74fcb103b1
Link to the right contributing guidelines 2020-03-05 11:04:33 -07:00