20755 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	4aa3be9b42	Move & upgrade babel runtime into dependencies (like it wants) ... https://babeljs.io/docs/en/babel-runtime	2020-01-23 15:43:22 -07:00
Travis Ralston	ed93761b00	Merge pull request #3918 from matrix-org/travis/aliases ... Don't list every single alias when there's many	2020-01-23 15:09:08 -07:00
Travis Ralston	18f8f8858c	Don't list every single alias when there's many	2020-01-23 15:00:18 -07:00
Travis Ralston	1ac82a9f16	Revert "Don't list every single alias when there's many" ... This reverts commit 6fc647c3d9.	2020-01-23 15:00:02 -07:00
Travis Ralston	6fc647c3d9	Don't list every single alias when there's many	2020-01-23 14:59:52 -07:00
Travis Ralston	6be0cb92ff	Merge pull request #3907 from matrix-org/travis/user-lists-suggestions ... Try to populate user IDs even when the server's directory fails us	2020-01-23 14:49:27 -07:00
Bruno Windels	ce32c12303	Merge pull request #3912 from matrix-org/bwindels/verifyowndevicechecks ... Remove .event property on verification request	2020-01-23 17:02:00 +00:00
Michael Telatynski	661b2415d6	Merge pull request #3911 from matrix-org/t3chguy/a11y_tweak ... Attempt to fix Safari + VoiceOver misunderstanding the timeline list	2020-01-23 16:27:58 +00:00
J. Ryan Stinnett	e3027d3086	Merge pull request #3913 from matrix-org/jryans/negotiate-e2e-dms ... Enable encryption in DMs with device keys	2020-01-23 16:23:59 +00:00
Travis Ralston	a566c74e39	Merge pull request #3905 from matrix-org/travis/user-lists-final ... Fix scrollable area and padding in user lists dialog	2020-01-23 09:04:40 -07:00
J. Ryan Stinnett	1e25b32ba3	Enable encryption in DMs with device keys ... When the cross-signing lab is enabled, this changes DMs to use encryption as long as all invited users have uploaded device keys (which we're using as a proxy for "has some client that understands E2E"). Fixes https://github.com/vector-im/riot-web/issues/12005	2020-01-23 16:03:42 +00:00
Michael Telatynski	26aa4bb4f3	Merge pull request #3909 from matrix-org/t3chguy/invite_reject_ignore ... Add Reject & Ignore user button to invites view	2020-01-23 14:59:19 +00:00
Bruno Windels	8a523fbb59	remove this log line, so we can remove the .event property ... this is likely the error Dave hit last week, because there was no .request event set yet for some other reasons that have been fixed already (the event being put in the wrong map, theirs instead of us) in the VerificationRequest object.	2020-01-23 15:53:54 +01:00
Michael Telatynski	604e244265	Attempt to fix Safari + VoiceOver misunderstanding the timeline list	2020-01-23 14:53:41 +00:00
J. Ryan Stinnett	2b16b650fe	Add encryption option to createRoom	2020-01-23 14:05:38 +00:00
J. Ryan Stinnett	c25c1878b8	Move control of room initial state into createRoom ... This changes `createRoom` so it has more control of the room's initial state, and appends state for different features, rather resetting the entire state array. This makes room for also controlling encryption state in the next change.	2020-01-23 13:54:43 +00:00
Michael Telatynski	d7a4698db8	Merge pull request #3891 from matrix-org/t3chguy/fix_multi_paragraph_formatting ... Fix paragraph-awareness of the composer formatting features	2020-01-23 13:31:12 +00:00
Michael Telatynski	30bfd4046d	improve spacing of buttons on RoomPreviewBar	2020-01-23 12:27:25 +00:00
Michael Telatynski	1747a62118	add missing awaits	2020-01-23 11:55:08 +00:00
David Baker	8d59cb4632	Merge pull request #3903 from matrix-org/dbkr/bootstrap_visuals_1 ... Updated visuals for cross-signing bootstrap	2020-01-23 11:51:32 +00:00
Michael Telatynski	873952a83e	delint	2020-01-23 11:51:31 +00:00
Michael Telatynski	6c3ac2d0c4	Add Reject & Ignore user button to invites view	2020-01-23 11:50:59 +00:00
Michael Telatynski	13bb719a89	Add comment for operations loop	2020-01-23 11:22:22 +00:00
David Baker	10db79bb93	Merge remote-tracking branch 'origin/develop' into dbkr/bootstrap_visuals_1	2020-01-23 11:05:21 +00:00
David Baker	442b8be459	Merge pull request #3897 from matrix-org/dbkr/bootstrap_from_key_backup_ui ... Implement some parts of new cross signing bootstrap UI	2020-01-23 11:04:49 +00:00
David Baker	c0b7132404	Different copy on done screen if we setup from scratch	2020-01-23 10:18:08 +00:00
Travis Ralston	e41f94bdb7	Try to populate user IDs even when the server's directory fails us ... Fixes https://github.com/vector-im/riot-web/issues/11943	2020-01-22 22:33:50 -07:00
Travis Ralston	054ebb9458	Fix scrollable area and padding in user lists dialog	2020-01-22 21:07:29 -07:00
J. Ryan Stinnett	1fdd155dd2	Merge pull request #3904 from matrix-org/jryans/report-admin-external-links ... Treat links as external in report content admin message	2020-01-23 01:06:42 +00:00
J. Ryan Stinnett	a504faa2f6	Treat links as external in report content admin message ... This marks all the links in the report content admin message (in Markdown format) as external so they open in a new tab.	2020-01-22 22:08:37 +00:00
Michael Telatynski	7a028af359	Merge pull request #3902 from matrix-org/t3chguy/free_the_svg ... Be consistent about our settings svg, free the other one	2020-01-22 21:14:25 +00:00
David Baker	a95cde106f	Merge pull request #3899 from matrix-org/dbkr/npm_prepare ... Change prepublish script to prepare	2020-01-22 20:57:18 +00:00
David Baker	30b0663eb0	lint	2020-01-22 18:15:35 +00:00
David Baker	78654cc693	Updated visuals for cross-signing bootstrap ... * Use Fields rather than plain inputs * Update padding & alignment to match designs * Add Skip buttons * Update copy as per designs Part of https://github.com/vector-im/riot-web/issues/11902 Based on https://github.com/matrix-org/matrix-react-sdk/pull/3897	2020-01-22 18:08:39 +00:00
Michael Telatynski	33b5d42c06	Be consistent about our settings svg, free the other one	2020-01-22 15:34:17 +00:00
David Baker	2e0977fb0c	Merge pull request #3901 from matrix-org/dbkr/kill_react_sdk_version ... Remove the react-sdk version	2020-01-22 15:26:22 +00:00
Michael Telatynski	cd412b1df4	Merge pull request #3900 from matrix-org/t3chguy/buildkite ... BuildKite: Retry end-to-end tests automatically once if they fail	2020-01-22 15:26:01 +00:00
David Baker	7e52eb9f65	Unused import	2020-01-22 15:16:41 +00:00
David Baker	c04872dd9b	i18n	2020-01-22 15:12:38 +00:00
Michael Telatynski	d04ba40efe	fix syntax	2020-01-22 15:05:40 +00:00
David Baker	e3a28e3e44	Remove the react-sdk version ... I'm not sure if there was ever a point where this did work and we had 'dist' and 'gitHead' properties in our package.json but I can't find any trace of them now and I'm sick of this just being there syaing '<local>' all the time.	2020-01-22 15:05:25 +00:00
Michael Telatynski	088b1ea628	Retry end-to-end tests automatically once if they fail, flakey flake	2020-01-22 15:03:48 +00:00
Michael Telatynski	97edb824bc	Merge pull request #3893 from matrix-org/t3chguy/double_slash ... Slash Command improvements around sending messages with leading slash	2020-01-22 14:32:09 +00:00
J. Ryan Stinnett	33533646d3	Merge pull request #3898 from matrix-org/jryans/extra-report-content ... Support admin configurable message when reporting content	2020-01-22 14:25:39 +00:00
Michael Telatynski	516dd25797	fix typo in fallback codepath	2020-01-22 14:24:10 +00:00
David Baker	2842e8dee8	Change prepublish script to prepare ... prepublish is deprecated (prepare also runs for git checkouts, and lib will need to be built in this case).	2020-01-22 14:15:17 +00:00
J. Ryan Stinnett	fbb65f068a	Support admin configurable message when reporting content ... This adds support for an admin-configured message in config.json to be shown in the report content dialog to allow linking to community rules, etc. Fixes https://github.com/vector-im/riot-web/issues/11992	2020-01-22 14:07:18 +00:00
Michael Telatynski	832da062cc	Improve trailing spurious breaks + tests	2020-01-22 13:37:27 +00:00
Michael Telatynski	e1e53f567f	add more tests	2020-01-22 11:56:27 +00:00
David Baker	e98269822c	Add icon to bootstrap dialogs	2020-01-22 11:44:47 +00:00