20687 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zoe	0809d7dcba	Merge pull request #3875 from matrix-org/zip/11880-message-shields ... Verify individual messages via cross-signing	2020-01-21 18:11:36 +00:00
Travis Ralston	5cb0dc41b7	Merge pull request #3882 from matrix-org/travis/fix-tests ... Fix layering of dependencies in riot-web and e2e tests	2020-01-21 11:09:27 -07:00
Travis Ralston	708f62784f	Consistency ... Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>	2020-01-21 10:59:33 -07:00
Travis Ralston	33220c2d72	Ensure generated files are present for riot-web tests	2020-01-21 10:53:17 -07:00
Michael Telatynski	587ff6ad75	Merge pull request #3844 from matrix-org/t3chguy/roving ... Implement Roving Tab Index and Room List as TreeView	2020-01-21 17:36:30 +00:00
Zoe	2480f709b3	E2ESTATE -> E2E_STATE	2020-01-21 17:19:10 +00:00
Zoe	ec714283ca	Merge pull request #3888 from matrix-org/zip/11833-overlay-shields ... Move room header shields over the avatar for the room	2020-01-21 16:56:09 +00:00
J. Ryan Stinnett	2d8f33e9ee	Merge pull request #3890 from matrix-org/jryans/clipped-shield ... Fix toast icon to prevent clipping	2020-01-21 16:52:19 +00:00
J. Ryan Stinnett	d6b6a4cdfa	Merge pull request #3889 from matrix-org/jryans/hide-verif-unless-e2e ... Only show devices and verify actions in E2EE rooms	2020-01-21 16:52:08 +00:00
J. Ryan Stinnett	790d2c1472	Fix toast icon to prevent clipping ... This fixes the bottom and right edges of the toast icon, which were getting clipped away. Fixes https://github.com/vector-im/riot-web/issues/11915	2020-01-21 15:30:03 +00:00
J. Ryan Stinnett	9c0cf326c1	Only show devices and verify actions in E2EE rooms ... This changes logic to only show the devices list and verify button in E2EE rooms, matching the design. Fixes https://github.com/vector-im/riot-web/issues/11839	2020-01-21 15:13:03 +00:00
J. Ryan Stinnett	224528afd4	Merge pull request #3887 from matrix-org/jryans/user-verif-mismatch ... Change user info verification checks to use cross-signing	2020-01-21 13:44:22 +00:00
Zoe	c8a2f6a5a0	Move room header shields over the avatar for the room ... Currently this is calibrated like the lil' DM icon is	2020-01-21 13:33:16 +00:00
Michael Telatynski	ddfed32ea9	Merge pull request #3886 from matrix-org/t3chguy/insert_mention_colon ... Fix click-to-ping not inserting colon if composer non-empty	2020-01-21 13:15:38 +00:00
J. Ryan Stinnett	b3d56b378e	Use cross-signing verification only for own devices ... The device verification checks are slightly more nuanced: we want to use stricter cross-signing checks for your own devices to encourage everyone to trust their devices via cross-signing so that other users can in turn trust them. However, for other users, it's okay to use the looser verification check that also includes locally verified devices.	2020-01-21 12:03:52 +00:00
J. Ryan Stinnett	a7231d7336	New session toast should check cross-signing verification ... To ensure all your sessions are cross-signing verified, we use the more specific test for only that kind of verification in the new session toast.	2020-01-21 11:33:14 +00:00
Michael Telatynski	f56a9d246f	Fix index for _insertMention	2020-01-21 11:13:08 +00:00
Michael Telatynski	adec308529	Merge pull request #3884 from matrix-org/t3chguy/emoji_space_complete ... Fix emoticon space completion for upper case emoticons like :D xD	2020-01-21 11:01:40 +00:00
J. Ryan Stinnett	8a00ff7f1f	Change all user info verification checks to cross-signing ... This fixes some user vs. device verification confusion in user info by changing all the verification tests to the cross-signing variant when the lab is enabled. Fixes https://github.com/vector-im/riot-web/issues/11886	2020-01-21 11:00:40 +00:00
J. Ryan Stinnett	ff8ee5cc7d	Merge pull request #3880 from matrix-org/jryans/repair-cs-panel ... Repair cross-signing panel with async status	2020-01-21 10:56:13 +00:00
J. Ryan Stinnett	8b2adf313f	Merge pull request #3878 from matrix-org/jryans/hide-extra-backup ... Remove temporary key backup button	2020-01-21 10:33:19 +00:00
Michael Telatynski	26bba4416b	Fix emoticon space completion for upper case emoticons like :D xD	2020-01-21 10:12:23 +00:00
Zoe	d34f1e52ad	constants for e2estates	2020-01-21 10:08:53 +00:00
Travis Ralston	3b2f96bc04	Try explicitly mapping the directory	2020-01-20 18:02:54 -07:00
Travis Ralston	776b3af6bb	Fix relative pathing on riot-web link	2020-01-20 16:33:22 -07:00
Travis Ralston	19615d3721	Disable minification of Riot in end-to-end tests	2020-01-20 16:33:13 -07:00
Travis Ralston	27412ba0b2	Fix end-to-end test layering too	2020-01-20 16:23:33 -07:00
Travis Ralston	3eeeb9c6af	Remove irrelevant build steps	2020-01-20 16:20:02 -07:00
Travis Ralston	62b1dd77a6	Fix layering of the riot-web tests pipeline	2020-01-20 16:12:59 -07:00
Travis Ralston	4e018905fc	Remove Chrome stuff (not needed for riot-web tests anymore)	2020-01-20 15:17:47 -07:00
Michael Telatynski	397e116efb	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/roving	2020-01-20 20:48:11 +00:00
Michael Telatynski	be6a382121	delint	2020-01-20 20:46:12 +00:00
J. Ryan Stinnett	5a67bd4b46	Repair cross-signing panel with async status ... This repairs the cross-signing panel after recent changes that made the panel's status an async function. Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3864 Fixes https://github.com/vector-im/riot-web/issues/11952	2020-01-20 20:35:25 +00:00
Michael Telatynski	0bcfe5819f	Integrate handleHomeEnd	2020-01-20 20:31:36 +00:00
J. Ryan Stinnett	e947a68e13	Remove temporary key backup button ... This removes the temporary extra key backup setup button in Settings used for testing with and without cross-signing. With this change, there's only one button and the path you take is determined by the labs flag. Fixes https://github.com/vector-im/riot-web/issues/11890	2020-01-20 20:21:03 +00:00
Travis Ralston	7193e7dcb0	Merge pull request #3866 from matrix-org/travis/ftue/user-lists/7-suggestions ... Score users who have recently spoken higher in invite suggestions	2020-01-20 10:53:18 -07:00
Zoe	befd4e1f5a	shout more for unknown devices, but keep the tooltip	2020-01-20 17:25:08 +00:00
Bruno Windels	95a0ebaf06	Merge pull request #3796 from matrix-org/bwindels/verification-right-panel ... Initial support for verification in right panel	2020-01-20 17:18:32 +00:00
Zoe	12c4e45387	User verified but device deleted isn't a useful state	2020-01-20 17:15:38 +00:00
Travis Ralston	7c877fb9c4	Reinstate client variable that is actually used	2020-01-20 10:08:35 -07:00
Travis Ralston	727ca8ba77	Don't double check ourselves	2020-01-20 10:04:14 -07:00
Travis Ralston	20ec2a63d4	Merge pull request #3868 from matrix-org/travis/ftue/user-lists/8.1-dialog-hieght ... Prevent the invite dialog from jumping around when elements change	2020-01-20 10:01:41 -07:00
Travis Ralston	551b2907d8	Fix variable usage and naming	2020-01-20 09:29:33 -07:00
David Baker	bab2c982ab	Merge pull request #3876 from matrix-org/dbkr/prepublish ... Add prepublish script	2020-01-20 16:04:21 +00:00
David Baker	34c69a59b2	Add prepublish script ... https://github.com/matrix-org/matrix-react-sdk/pull/3723 removed the prepare script which was how the SDK got built before being published. Add it back as a more modern prepublish script.	2020-01-20 15:26:34 +00:00
Zoe	51fb3b494f	lint and i18n	2020-01-20 15:25:28 +00:00
Zoe	f77eb07849	Verify individual messages via cross-signing ... Fixes #11880	2020-01-20 15:16:41 +00:00
David Baker	a849826a41	Merge pull request #3874 from matrix-org/dbkr/fix_editor_modified_flag_2 ... Fix arrows keys moving through edit history	2020-01-20 13:42:44 +00:00
David Baker	277f107924	Set flag before mutating on cut too	2020-01-20 13:03:09 +00:00
David Baker	2ed5d89c9f	Fix arrows keys moving through edit history ... Different fix that fixes https://github.com/vector-im/riot-web/issues/11817 by setting the flag before the callback rather than having the update method set the flag. Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3842 Fixes https://github.com/vector-im/riot-web/issues/11917	2020-01-20 12:20:21 +00:00