27441 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Telatynski	a095f858b0	Merge pull request #5087 from matrix-org/t3chguy/fix/14868 ... Make the room sublist show more/less buttons treeitems	2020-08-08 10:46:57 +01:00
J. Ryan Stinnett	286624a89e	Merge pull request #5092 from matrix-org/jryans/defer-cross-signing-setup ... Share and debug master cross-signing key	2020-08-07 16:06:35 +01:00
J. Ryan Stinnett	9e40e079ff	Use an explicit list of keys to share	2020-08-07 15:54:05 +01:00
J. Ryan Stinnett	810f07a846	Report master key cache status in rageshakes	2020-08-06 15:26:47 +01:00
J. Ryan Stinnett	4c1956a3c2	Show master key cache status in Settings	2020-08-06 15:25:33 +01:00
J. Ryan Stinnett	060f2cf54f	Enable sharing of master cross-signing key ... We've realised it's beneficial to support sharing the master cross-singing key so that new devices can fully manage cross-signing on your account. Part of https://github.com/vector-im/element-web/issues/13896	2020-08-06 15:17:39 +01:00
Michael Telatynski	0da31de5ad	Merge pull request #5086 from matrix-org/t3chguy/notifications12 ... Create Map comparison utilities and convert Hooks to Typescript	2020-08-05 16:28:52 +01:00
RiotRobot	45b79a0b7c	Reset matrix-js-sdk back to develop branch	2020-08-05 16:11:28 +01:00
RiotRobot	f8cdd51fe3	Merge branch 'master' into develop	2020-08-05 16:10:29 +01:00
RiotRobot	f8ed635fbf	v3.1.0	2020-08-05 16:05:30 +01:00
RiotRobot	299aa3ed98	Prepare changelog for v3.1.0	2020-08-05 16:05:29 +01:00
RiotRobot	57814a40c1	Upgrade matrix-js-sdk to 8.0.1	2020-08-05 15:50:03 +01:00
J. Ryan Stinnett	dd3e6292ac	Merge pull request #5091 from matrix-org/jryans/safari-roomlist-scroll-release ... Fix room list scrolling in Safari	2020-08-05 14:51:47 +01:00
J. Ryan Stinnett	2f3eff4301	Merge pull request #5090 from matrix-org/jryans/safari-roomlist-scroll ... Fix room list scrolling in Safari	2020-08-05 14:45:27 +01:00
J. Ryan Stinnett	1e868a256d	Fix room list scrolling in Safari ... This sets `flex-basis` properly in Safari so the room list is scrollable. Fixes https://github.com/vector-im/element-web/issues/14877	2020-08-05 14:37:09 +01:00
J. Ryan Stinnett	af825b4559	Fix room list scrolling in Safari ... This sets `flex-basis` properly in Safari so the room list is scrollable. Fixes https://github.com/vector-im/element-web/issues/14877	2020-08-05 14:32:02 +01:00
J. Ryan Stinnett	7748e3ae1a	Merge pull request #5083 from matrix-org/jryans/riot-to-element ... Replace Riot with Element in docs and comments	2020-08-05 12:25:45 +01:00
Michael Telatynski	f1505833b7	Make the room sublist show more/less buttons treeitems	2020-08-05 09:56:31 +01:00
Michael Telatynski	3675128061	Merge pull request #5027 from matrix-org/t3chguy/room-list/13981 ... When the room view isn't active don't highlight it in room list	2020-08-05 09:29:25 +01:00
Michael Telatynski	6220f50360	delint	2020-08-05 09:28:02 +01:00
Michael Telatynski	cd29edb442	Write more typescript defs	2020-08-05 09:13:01 +01:00
Michael Telatynski	f5d75bc078	fix comments	2020-08-04 22:03:30 +01:00
Michael Telatynski	ed4a427287	Convert hooks to Typescript	2020-08-04 22:00:05 +01:00
Michael Telatynski	93b4ea5be4	Create Maps utility comparison functions	2020-08-04 21:57:37 +01:00
Michael Telatynski	9ce96bc28d	delint	2020-08-04 21:35:42 +01:00
Michael Telatynski	80dff8706c	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/room-list/13981 ... Conflicts: src/@types/global.d.ts src/stores/RoomViewStore.tsx	2020-08-04 21:33:27 +01:00
Bruno Windels	a63ff13ec4	Merge pull request #5084 from matrix-org/bwindels/fixinvitedialogcrash-release ... Add null guard in InviteDialog	2020-08-04 09:30:14 +00:00
Bruno Windels	dc5ca0e34d	Merge branch 'bwindels/fixinvitedialogcrash' into bwindels/fixinvitedialogcrash-release	2020-08-04 11:21:13 +02:00
Bruno Windels	c1ec41715c	Merge pull request #5082 from matrix-org/bwindels/fixinvitedialogcrash ... Add null guard in InviteDialog	2020-08-04 08:35:20 +00:00
J. Ryan Stinnett	ce226ab534	Replace Riot with Element in docs and comments ... This only covers the simple cases of references to issues and repos. More complex areas, such as deployment scripts, will be handled separately. Part of https://github.com/vector-im/element-web/issues/14864	2020-08-03 18:33:36 +01:00
Bruno Windels	7c22773bc4	Merge pull request #5073 from matrix-org/bwindels/remove-composer-overlay-icons ... remove emoji icons in autocomplete/reply by designer request	2020-08-03 16:15:41 +00:00
Bruno Windels	1899bdf419	fix i18n	2020-08-03 18:05:52 +02:00
Bruno Windels	fe1d375dd2	Merge remote-tracking branch 'origin/develop' into bwindels/remove-composer-overlay-icons	2020-08-03 18:05:26 +02:00
Bruno Windels	71a9fef491	fix InviteDialog crash	2020-08-03 17:42:54 +02:00
Bruno Windels	fba1158700	Merge pull request #5079 from matrix-org/bwindels/alert-file-panel-empty-state ... Add title and icon to empty state of file and notification panel	2020-08-03 12:58:13 +00:00
Michael Telatynski	25499fc687	Merge pull request #5045 from matrix-org/t3chguy/fix/10818 ... Mass redact ignore room creation events	2020-08-03 13:52:21 +01:00
J. Ryan Stinnett	5e67c07afc	Merge pull request #5080 from matrix-org/jryans/release-sticky-favourite ... Handle tag changes in sticky room updates	2020-08-03 13:35:29 +01:00
J. Ryan Stinnett	533b5d80d6	Merge pull request #5067 from matrix-org/jryans/adjust-chevrons ... Replace all chevrons with a single icon	2020-08-03 13:34:37 +01:00
J. Ryan Stinnett	53686e8805	Merge pull request #5077 from matrix-org/travis/i18n ... Replace i18n generation script with something matching our project	2020-08-03 13:33:09 +01:00
Travis Ralston	7b7105f3f7	Handle tag changes in sticky room updates ... Fixes https://github.com/vector-im/element-web/issues/14848 When we're filtering the sticky room will be excluded from the filtered set, and thus won't even appear in the `getOrderedRoomsWithoutSticky()` result. Further, we will likely have to update the position ourselves to ensure the sticky room can be placed appropriately in the list.	2020-08-03 13:26:19 +01:00
Bruno Windels	5a3bda7eea	Add title and icon to empty state of file and notification panel	2020-08-03 13:30:56 +02:00
J. Ryan Stinnett	05a30b8eab	Merge pull request #5078 from matrix-org/travis/room-list/sticky-favourite ... Handle tag changes in sticky room updates	2020-08-03 12:05:06 +01:00
Travis Ralston	7022d86a3c	Handle tag changes in sticky room updates ... Fixes https://github.com/vector-im/element-web/issues/14848 When we're filtering the sticky room will be excluded from the filtered set, and thus won't even appear in the `getOrderedRoomsWithoutSticky()` result. Further, we will likely have to update the position ourselves to ensure the sticky room can be placed appropriately in the list.	2020-07-31 16:26:03 -06:00
J. Ryan Stinnett	71af4580e8	Convert jump to unread button	2020-07-31 20:39:17 +01:00
Travis Ralston	fed20d46c5	Replace i18n generation script with something matching our project ... We've been relying on flow being close enough to TypeScript for so long that it is starting to run into issues. Here we switch to babel's parser given we already use babel in the project. Babel's parser is also *slightly* faster, allowing us to generate strings 0.1s faster.	2020-07-31 13:33:33 -06:00
J. Ryan Stinnett	7aaa4997c2	Convert jump to bottom button	2020-07-31 20:33:15 +01:00
J. Ryan Stinnett	e9fcbfe3c8	Merge pull request #5075 from matrix-org/jryans/rm-tslint ... Remove leftover bits of TSLint	2020-07-31 20:30:51 +01:00
Travis Ralston	e8d1024c45	Merge pull request #5076 from matrix-org/travis/cleanup/1 ... Clean up documentation of Whenable + fix other code concerns	2020-07-31 11:27:19 -06:00
J. Ryan Stinnett	f28bce36e1	Merge remote-tracking branch 'origin/develop' into jryans/adjust-chevrons	2020-07-31 18:23:57 +01:00
J. Ryan Stinnett	5cf86c7573	Merge pull request #5074 from matrix-org/bwindels/center-jump-down-chevron ... Center the jump down/up icon, looks misaligned	2020-07-31 18:21:56 +01:00