23444 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	37bd0f3508	Merge pull request #4379 from matrix-org/travis/moar-jitsi ... Support m.jitsi-typed widgets as Jitsi widgets	2020-04-20 09:31:23 -06:00
Travis Ralston	a55698e943	Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements	2020-04-20 09:22:38 -06:00
Travis Ralston	d8a5ba9b14	Merge branch 'develop' into travis/moar-jitsi	2020-04-20 09:21:48 -06:00
David Baker	360be14b0e	Merge pull request #4450 from matrix-org/dbkr/devicelistener_wait_until_synced ... Don't recheck DeviceListener until after initial sync is finished	2020-04-20 15:21:22 +01:00
David Baker	30a3600874	Merge pull request #4449 from matrix-org/dbkr/buttonplaceholder_classname ... Fix CSS class in ButtonPlaceholder	2020-04-20 14:39:20 +01:00
David Baker	2546e23a3e	Don't recheck DeviceListener until after initial sync is finished ... Each recheck caused a GET to account data to see if the master key exists if done before the initial sync, which is unnecessary here. This just makes it wait until the initial sync is done to recheck. Fixes https://github.com/vector-im/riot-web/issues/13279	2020-04-20 14:36:15 +01:00
David Baker	50cc44f0c4	Fix CSS class in ButtonPlaceholder	2020-04-20 14:16:34 +01:00
Michael Telatynski	ccc1f1fe37	Merge pull request #4441 from matrix-org/t3chguy/login-tab ... Password Login make sure tab takes user to password field	2020-04-20 13:57:52 +01:00
Michael Telatynski	c77589c9f7	Merge pull request #4439 from matrix-org/t3chguy/network_dropdown ... Network Dropdown fix things not scrolling properly	2020-04-20 13:57:42 +01:00
Michael Telatynski	bc5fe12a60	Merge pull request #4448 from matrix-org/t3chguy/imageview ... ImageView make clicking off it easier	2020-04-20 13:55:20 +01:00
Michael Telatynski	62763650d1	Merge pull request #4443 from matrix-org/t3chguy/cmd_rageshake ... Add slash command to send a rageshake	2020-04-20 13:51:48 +01:00
Michael Telatynski	4494c6cf2b	ImageView make clicking off it easier ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-20 11:21:51 +01:00
Damir Jelić	3781bdc975	EventIndex: Add a missing semicolon.	2020-04-20 10:10:16 +02:00
Damir Jelić	6084c08f34	EventIndex: Filter out events that don't have a propper content value.	2020-04-20 10:05:04 +02:00
Travis Ralston	a2a6dbc7ee	Merge pull request #4445 from matrix-org/revert-4388-thobyv/make-filepanel-remember-scroll-position ... Revert "Fix Filepanel scroll position state lost when room is changed"	2020-04-19 19:14:20 -06:00
Travis Ralston	972baa881b	Revert "Fix Filepanel scroll position state lost when room is changed"	2020-04-19 19:14:08 -06:00
Michael Telatynski	881848b98b	Add modal to confirm that rageshake from cmd was sent ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-19 12:19:31 +01:00
Michael Telatynski	d0410ade5e	i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-19 12:11:40 +01:00
Michael Telatynski	170d10a1a6	Add rageshake slash command ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-19 12:09:07 +01:00
Michael Telatynski	3bc5a0a0b2	Convert submit-rageshake to typescript ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-19 12:06:56 +01:00
Michael Telatynski	c04a8d326e	Merge pull request #4442 from matrix-org/t3chguy/change_seshat_copy ... Update seshat copy to remove trailing full stop	2020-04-19 11:37:48 +01:00
Michael Telatynski	7fe8894c51	Update seshat copy to remove trailing full stop ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-18 23:16:40 +01:00
Michael Telatynski	b86b42c89f	Password Login make sure tab takes user to password field ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-18 16:18:01 +01:00
Michael Telatynski	a0f704f419	Network Dropdown fix things not scrolling properly ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-04-18 15:08:15 +01:00
Travis Ralston	9e7b843f5d	Merge pull request #4388 from ThobyV/thobyv/make-filepanel-remember-scroll-position ... Fix Filepanel scroll position state lost when room is changed	2020-04-17 15:24:52 -06:00
Travis Ralston	e0d6fa3f51	Rename ref to timelinePanel	2020-04-17 15:15:51 -06:00
Travis Ralston	dd444ffa5d	Merge pull request #4436 from matrix-org/travis/e2e-e2e-tests ... Fix end-to-end tests for end-to-end encryption verification	2020-04-17 15:14:12 -06:00
Travis Ralston	d910eb4d57	Merge branch 'develop' into thobyv/make-filepanel-remember-scroll-position	2020-04-17 15:10:12 -06:00
Travis Ralston	432dbab8cb	Fix start chat button variable name	2020-04-17 15:06:59 -06:00
Travis Ralston	a234cb8a44	Merge pull request #4437 from matrix-org/travis/test-logs ... Don't explode if the e2e test directory exists when crashing	2020-04-17 14:52:12 -06:00
Travis Ralston	88b5c3ca84	Don't explode if the e2e test directory exists when crashing ... This is largely expected in local test environments where the developer probably won't remember to clear out the directory themselves.	2020-04-17 14:39:45 -06:00
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