db9895f223
Merge pull request #4189 from matrix-org/bwindels/aliasesintimeline
...
Update timeline rendering of aliases
2020-03-10 12:43:14 +00:00
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
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
378939bed7
add timeline text descriptions for modifying alt_aliases
2020-03-09 18:24:48 +01:00
0d8b4ac194
remove timeline tiles for m.room.aliases events
2020-03-09 18:23:32 +01:00
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
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
d2cd64d9d3
Merge pull request #4186 from matrix-org/jryans/mjolnir-stop
...
Make Mjolnir stop more robust
2020-03-09 16:15:32 +00:00
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
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
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
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
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
1530c91772
Merge pull request #4182 from matrix-org/travis/edit-redactions
...
Disable edits on redacted events
2020-03-06 14:34:57 -07:00
e4d323d2f2
Disable edits on redacted events
...
Fixes https://github.com/vector-im/riot-web/issues/12633
2020-03-06 14:23:20 -07:00
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
b312e73510
Merge branch 'bwindels/toastwithoutxsign' into bwindels/bringbacklegacyverififnoxsignkeys
2020-03-06 17:44:23 +01:00
1f9bd55f3b
revert to legacy user verification (over to_device) without xsign keys
2020-03-06 17:37:01 +01:00
b0617f10e8
stick to IncomingSasDialog as VerificationRequestDialog doesn't show sender yet, makes e2e tests fail
2020-03-06 17:22:56 +01:00
f8ef5bb6a5
check .started first as it can be both .started and pending
2020-03-06 17:20:08 +01:00
a7de575316
use crypto.verification.request even when xsign is disabled
2020-03-06 16:50:39 +01:00
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
364899b27d
ManageEventIndexDialog: Show how many rooms are done instead being processed.
2020-03-06 15:44:23 +01:00
bff3f3e632
Revert "ManageEventIndexDialog: Reword the status for the currently indexing rooms."
...
This reverts commit 7d6569a0b87c48733dbddec3c2662325977d0234.
2020-03-06 15:44:23 +01:00
8fe54e5dca
ManageEventIndexDialog: Reword the status for the currently indexing rooms.
2020-03-06 15:44:23 +01:00
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
1975a8e082
Merge branch 'develop' into move-read-receipts-to-bottom
2020-03-05 17:13:24 -07:00
74fcb103b1
Link to the right contributing guidelines
2020-03-05 11:04:33 -07:00
fcc28c4d4d
Merge pull request #4159 from mstriemer/mark-as-read-button
...
Include a mark as read X under the scroll to unread button
2020-03-05 11:01:12 -07:00
3527fae275
Merge pull request #4178 from n0emis/crosssigning-presence
...
Show the room presence indicator, even when cross-singing is enabled
2020-03-05 10:38:01 -07:00
64b757e302
Merge pull request #4179 from matrix-org/bwindels/localechoforlegacyverif
...
Add local echo when clicking "Manually Verify" in unverified session dialog
2020-03-05 17:09:44 +00:00
7d051d6a1d
await request promise inside encryption panel to show spinner
2020-03-05 17:44:35 +01:00
3c2f4a5c42
Merge pull request #4129 from matrix-org/benp/add-security-disclosure-link
...
link to matrix.org/security-disclosure-policy in help screen
2020-03-05 14:47:02 +00:00
d28d330b33
run yarn i18n
2020-03-05 14:33:40 +00:00
ce84967225
update Security Disclosure Policy link text
2020-03-05 14:18:12 +00:00
a6882cece1
increase margin between Settings sections
2020-03-05 14:10:44 +00:00
26177a19d5
access cross-signing callbacks via method
2020-03-05 10:49:06 +00:00
5df35ea432
Merge pull request #4174 from matrix-org/bwindels/showverifyifuserhasxsignkeys
...
only show verify button if user has uploaded cross-signing keys
2020-03-05 09:24:09 +00:00
a5cd0a7d5f
indent by 4 spaces
2020-03-05 11:09:45 +01:00
9836a7a655
Merge pull request #4176 from matrix-org/travis/linkify-rooms
...
Fix room alias references in topics
2020-03-04 15:35:34 -07:00
d3439c8101
Merge pull request #4177 from matrix-org/travis/no-rooms-dm
...
Fix not being able to start chats when you have no rooms
2020-03-04 15:35:27 -07:00
cf1d9cc8b5
make the linter happy
2020-03-04 22:46:07 +01:00
98f0a2ab67
show the room presence indicator, even when cross-singing is enabled
2020-03-04 22:30:24 +01:00
4a976acb84
Add a null check to getUniqueRoomsWithIndividuals
...
Fixes https://github.com/vector-im/riot-web/issues/12611
2020-03-04 14:18:56 -07:00
c6af591c6e
Ensure linkified topics in the room directory also work
...
We weren't passing the options object down to linkifyString.
Fixes https://github.com/vector-im/riot-web/issues/12606
2020-03-04 14:14:03 -07:00
d820356990
Convert alias links in room header topics to local permalinks
...
Fixes https://github.com/vector-im/riot-web/issues/12605
2020-03-04 13:56:58 -07:00
7aba168c34
Merge pull request #4170 from matrix-org/travis/sso-register-dev
...
Disable registration flows on SSO servers
2020-03-04 12:59:08 -07:00
2204785026
Simplify SSO step checking
2020-03-04 12:26:08 -07:00
68258d8e89
Merge pull request #4160 from matrix-org/travis/filter-blank
...
Don't group blank membership changes
2020-03-04 12:24:31 -07:00
7f66198afb
Merge pull request #4175 from matrix-org/travis/room-list-updates
...
Ensure the room list always triggers updates on itself
2020-03-04 12:23:58 -07:00
Bruno Windels