22097 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Travis Ralston	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
Travis Ralston	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
Bruno Windels	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
Bruno Windels	7d051d6a1d	await request promise inside encryption panel to show spinner	2020-03-05 17:44:35 +01:00
J. Ryan Stinnett	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
Ben Parsons	d28d330b33	run yarn i18n	2020-03-05 14:33:40 +00:00
Ben Parsons	ce84967225	update Security Disclosure Policy link text	2020-03-05 14:18:12 +00:00
Ben Parsons	a6882cece1	increase margin between Settings sections	2020-03-05 14:10:44 +00:00
Zoe	26177a19d5	access cross-signing callbacks via method	2020-03-05 10:49:06 +00:00
Bruno Windels	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
Bruno Windels	a5cd0a7d5f	indent by 4 spaces	2020-03-05 11:09:45 +01:00
Travis Ralston	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
Travis Ralston	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
Simeon Keske	cf1d9cc8b5	make the linter happy	2020-03-04 22:46:07 +01:00
Simeon Keske	98f0a2ab67	show the room presence indicator, even when cross-singing is enabled	2020-03-04 22:30:24 +01:00
Travis Ralston	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
Travis Ralston	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
Travis Ralston	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
Travis Ralston	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
Travis Ralston	2204785026	Simplify SSO step checking	2020-03-04 12:26:08 -07:00
Travis Ralston	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
Travis Ralston	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
Travis Ralston	8e3fea9d0f	Use an algorithmic comparator for room list ops ... Not all algorithms are timestamp based.	2020-03-04 12:09:05 -07:00
Travis Ralston	80b44f0292	Always calculate the category of a room ... All the update triggers for the RoomListStore go through the `setRoomCategory` function, so by returning early we're not actually calculating where a room should be in the list.	2020-03-04 12:05:47 -07:00
Travis Ralston	b06a82ee80	Use textForEvent to determine if an event is worth rendering	2020-03-04 11:44:12 -07:00
Travis Ralston	3842bce74d	Fix SSO for new approach	2020-03-04 11:41:16 -07:00
Bruno Windels	8a964dbff0	avoid ref by getting count in setter callback	2020-03-04 17:19:54 +01:00