23413 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	77df610653	Appease the linter a bit more	2020-04-17 14:38:05 -06:00
Travis Ralston	5a9898591d	Appease the linter	2020-04-17 14:35:02 -06:00
Travis Ralston	e72008d7f1	Fix end-to-end tests for end-to-end encryption verification ... Fixes https://github.com/vector-im/riot-web/issues/13226 This isn't the fastest route, but it is a predictable route for the happy path we probably want to test. For example, Alice will already be staring at the DM and could easily accept the verification there, but we probably want to make sure that the toast is present and does the right thing. Similarly, neither of them need to verify that there's green shields everywhere, they should be implied, however an explicit check follows a real user's gaze.	2020-04-17 14:31:33 -06:00
Travis Ralston	885bb112ae	Merge pull request #4430 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/https-proxy-agent-2.2.4 ... Bump https-proxy-agent from 2.2.1 to 2.2.4 in /test/end-to-end-tests	2020-04-17 12:44:57 -06:00
Travis Ralston	e485f7a82c	Merge pull request #4432 from matrix-org/travis/e2e-docs ... Minor updates to e2e test instructions on Windows	2020-04-17 09:54:58 -06:00
Michael Telatynski	29028844f9	Merge pull request #4435 from matrix-org/t3chguy/typo1 ... Fix typo	2020-04-17 16:47:27 +01:00
Michael Telatynski	518639e8b1	Fix typo ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-17 16:04:38 +01:00
Zoe	fba57b1ff3	Merge pull request #4122 from matrix-org/foldleft/better-errors ... Catch errors sooner so users can recover more easily	2020-04-17 14:27:17 +01:00
Zoe	e3d784816d	Merge branch 'develop' into foldleft/better-errors	2020-04-17 14:11:05 +01:00
Michael Telatynski	66de06c7b9	Merge pull request #4381 from matrix-org/t3chguy/rageshake_incompatible_browser ... Rageshake: remind user of unsupported browser and send modernizr report	2020-04-17 13:14:40 +01:00
Michael Telatynski	47508b670d	Merge pull request #4338 from matrix-org/t3chguy/user_online_dot ... Design tweaks for DM Room Tiles	2020-04-17 13:06:34 +01:00
Michael Telatynski	cd65bdc799	Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot ... Conflicts: src/components/views/rooms/RoomBreadcrumbs.js src/components/views/rooms/RoomTile.js	2020-04-17 12:58:54 +01:00
Michael Telatynski	a2898b5cd8	Merge pull request #4434 from matrix-org/t3chguy/pill-breaking ... Don't break spills over multiple lines, ellipsis them at max-1-line	2020-04-17 12:43:14 +01:00
Michael Telatynski	4d91dc5bba	iterate pills in rich text styling ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-17 12:30:09 +01:00
Michael Telatynski	81c7660bf5	Iterate copy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-17 12:25:16 +01:00
Michael Telatynski	c3ff75d18f	Don't break spills over multiple lines, ellipsis them at max-1-line ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-17 11:04:52 +01:00
Travis Ralston	001e4c13bc	Merge pull request #4433 from matrix-org/travis/fix-e2e-tests ... Turn the end-to-end tests back on and fix the lazy-loading tests	2020-04-16 22:38:41 -06:00
Travis Ralston	a5f5f759cb	Create unencrypted rooms by default in e2e-tests ... Otherwise the lazy loading test will try to join the room after the encrypted messages have already been sent, making them invisible. See https://github.com/vector-im/riot-web/issues/13226#issuecomment-614928362	2020-04-16 16:27:43 -06:00
Travis Ralston	6d46ef548e	Enable tests again to catch failures	2020-04-16 16:26:29 -06:00
Travis Ralston	0489dcc8da	Minor updates to e2e test instructions on Windows	2020-04-16 15:55:33 -06:00
David Baker	3d99125ced	Merge pull request #4431 from matrix-org/dbkr/fix_key_backup_stored_debug ... Fix key backup debug panel	2020-04-16 21:14:37 +01:00
David Baker	9e18dbc0dc	Fix key backup debug panel ... The type changed so it thought it was not stored when it was	2020-04-16 21:08:14 +01:00
dependabot[bot]	d05ceec9d6	Bump https-proxy-agent from 2.2.1 to 2.2.4 in /test/end-to-end-tests ... Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4. - [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases) - [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4) Signed-off-by: dependabot[bot] <support@github.com>	2020-04-16 18:53:03 +00:00
Travis Ralston	cd73f3736a	Merge pull request #4416 from matrix-org/travis/cross-sign-setting ... Convert cross-signing feature flag to setting	2020-04-16 12:51:38 -06:00
Travis Ralston	3614170906	Disable scripts in CI too	2020-04-16 12:47:25 -06:00
Travis Ralston	1deece3fb5	Short-circuit all end to end tests	2020-04-16 12:41:48 -06:00
Travis Ralston	4af33d91eb	Track the issue number too	2020-04-16 12:26:08 -06:00
Travis Ralston	d04af1f3a8	Disable e2e tests for now	2020-04-16 12:24:04 -06:00
Travis Ralston	f4a5361b14	Wait a bit before continuing with the passphrase ... The continue button is probably no-oping due to being disabled.	2020-04-16 12:13:05 -06:00
Travis Ralston	5769b07a92	Select the right continue button ... There's no buttons in the field.	2020-04-16 12:04:48 -06:00
Travis Ralston	25fa675f88	Blind attempt at fixing the end to end tests	2020-04-16 11:46:29 -06:00
Travis Ralston	0fcaaab1d0	Appease the linter	2020-04-16 11:18:54 -06:00
Travis Ralston	54f8ba4d80	Remove UI to change the cross-signing setting	2020-04-16 11:15:12 -06:00
Travis Ralston	b5130ca5dc	Clean up setting definition to follow surrounding practices ... It's not perfect, but we're at least okay with it.	2020-04-16 11:12:47 -06:00
Travis Ralston	db749519e7	Merge branch 'develop' into travis/cross-sign-setting	2020-04-16 11:06:26 -06:00
Michael Telatynski	aa5573694e	Merge pull request #4428 from matrix-org/t3chguy/kegan_1 ... Make RoomPublishSetting import-skinnable	2020-04-16 17:26:01 +01:00
Michael Telatynski	e1e65a0fe1	Make RoomPublishSetting import-skinnable ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-16 17:13:33 +01:00
J. Ryan Stinnett	94ace258f3	Merge pull request #4425 from matrix-org/t3chguy/recovery_copy ... Iterate cross-signing copy	2020-04-16 15:31:35 +01:00
Michael Telatynski	aea7ede7d0	update PHASE_PASSPHRASE copy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-16 14:55:43 +01:00
Michael Telatynski	e942a35525	Fixxy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-16 14:09:41 +01:00
Michael Telatynski	af59c1b5b3	iterate copy some more ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-16 14:02:32 +01:00
Michael Telatynski	8c8509a603	i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-16 13:48:52 +01:00
Michael Telatynski	9ec8fda1ce	update Create SSSS Dialog copy ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-16 13:34:18 +01:00
Michael Telatynski	ce78e3b8d8	further tweaks by Matthew ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-16 13:28:12 +01:00
Michael Telatynski	1fb0f39c84	Replace Verify this session and Complete security ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-16 13:23:01 +01:00
Michael Telatynski	f65c31383d	Copy tweaks with Nad ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-16 12:52:35 +01:00
Bruno Windels	0b7f7820c2	Merge pull request #4422 from matrix-org/bwindels/loadtwemojiforsas ... Fix: ensure twemoji font is loaded when showing SAS emojis	2020-04-16 11:34:01 +00:00
Michael Telatynski	a9a2999ccc	Use recovery passphrase and recovery key everywhere ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-16 12:26:12 +01:00
Bruno Windels	3933c4c31c	ensure twemoji font is loaded when showing SAS emojis	2020-04-16 11:35:54 +02:00
Bruno Windels	4a2e13c227	Merge pull request #4421 from matrix-org/revert-4419-bwindels/loadtwemojiearlier ... Revert "Fix: load Twemoji before login so complete security gets the right emojis during SAS"	2020-04-16 09:26:06 +00:00