31730 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	be8ee1a576	Appease the linter	2021-03-18 21:05:51 -06:00
Travis Ralston	1d9d0cd7be	Convert a bunch more js-sdk imports to absolute paths ... Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.	2021-03-18 20:50:34 -06:00
Travis Ralston	e4b7a307ba	Merge pull request #5773 from matrix-org/travis/h/reg-type ... Replace type declaration in Registration.tsx	2021-03-18 14:58:44 -06:00
Travis Ralston	720ac9d837	Replace type declaration in Registration.tsx	2021-03-18 14:45:14 -06:00
Travis Ralston	b69d9e8c33	Merge pull request #5767 from matrix-org/travis/no-persist-logs ... Add possibility to delay rageshake persistence in app startup	2021-03-18 07:55:31 -06:00
Michael Telatynski	17399c6be6	Merge pull request #5764 from matrix-org/t3chguy/spaces4.9 ... Fix left panel resizing and lower min-width improving flexibility	2021-03-18 11:34:55 +00:00
Travis Ralston	e223235999	Merge pull request #5766 from matrix-org/travis/block-bugs ... Work around more cases where a rageshake server might not be present	2021-03-16 18:10:55 -06:00
Travis Ralston	c285b79a8d	Add possibility to delay rageshake persistence in app startup ... Even if the app takes a moment to set up persistence, this will still capture any logs before persistence happened.	2021-03-16 14:19:49 -06:00
Travis Ralston	451a3aaa3f	Work around more cases where a rageshake server might not be present ... We already do this for a number of other places (slash commands, help section of settings, etc) - these places appear to have been missed, though.	2021-03-16 13:50:43 -06:00
Michael Telatynski	0ce78f469f	Merge pull request #5761 from matrix-org/t3chguy/spaces4.8 ... Iterate space panel visually and functionally	2021-03-16 17:41:14 +00:00
Michael Telatynski	5ce3a05867	Update _SpacePanel.scss	2021-03-16 16:34:28 +00:00
David Baker	bd763a09ba	Merge pull request #5765 from matrix-org/dbkr/resize_dispatch_async ... Make some dispatches async	2021-03-16 16:00:05 +00:00
David Baker	67e2ae9988	Make some dispatches async ... It looks like these dispatches were being dispatched while already dispatching, causing soft crashes (although I can't see where the first dispatch was from). Either way, seems like these didn't need to be sync.	2021-03-16 15:42:03 +00:00
Michael Telatynski	688407abe6	Merge branch 'develop' into t3chguy/spaces4.9	2021-03-16 11:14:38 +00:00
Michael Telatynski	11cd791c76	Tweak left panel min widths for better flexibility	2021-03-16 11:13:39 +00:00
Michael Telatynski	baaceccfda	Rearrange dom hierarchy to put space panel at same level as LeftPanel ... so they don't steal horizontal space from each other	2021-03-16 11:13:39 +00:00
Michael Telatynski	4ae6c2f808	Merge pull request #5762 from timokoesters/fix-servername-parsing ... fix: make room directory correct when using a homeserver with explicit port	2021-03-16 10:12:58 +00:00
Travis Ralston	0e0ccfea88	Merge pull request #5756 from SimonBrandner/hangup-all-on-logout ... Hangup all calls on logout	2021-03-15 21:10:13 -06:00
Travis Ralston	78f7711dfd	Merge pull request #5757 from matrix-org/travis/cleanup-login ... Remove now-unused assets and CSS from CompleteSecurity step	2021-03-15 16:27:53 -06:00
Timo Kösters	f575625c7a	fix: make room directory correct when using a homeserver with explicit port ... Server names are allowed to contain ':' to specify a port, see https://matrix.org/docs/spec/appendices#server-name User ids on the other hand are not allowed to contain ':', even historical user ids, see https://matrix.org/docs/spec/appendices#historical-user-ids Therefore we can use change the regex to make sure the localpart is not allowed to contain ':'.	2021-03-15 23:13:16 +01:00
RiotRobot	3154dd6cd4	Add SDK version to changelog	2021-03-15 14:48:40 +00:00
RiotRobot	a696c09e1e	Reset matrix-js-sdk back to develop branch	2021-03-15 14:47:08 +00:00
RiotRobot	1d1263c39a	Resetting package fields for development	2021-03-15 14:46:57 +00:00
RiotRobot	a9a50663a3	Merge branch 'master' into develop	2021-03-15 14:46:56 +00:00
RiotRobot	44fd41cb1e	v3.16.0	2021-03-15 14:45:36 +00:00
RiotRobot	2ef9f3327e	Prepare changelog for v3.16.0	2021-03-15 14:45:35 +00:00
RiotRobot	da627dab20	Upgrade matrix-js-sdk to 9.9.0	2021-03-15 14:38:57 +00:00
Michael Telatynski	62983ca48e	Fix space panel alignments when no scrollbar is present	2021-03-15 12:57:35 +00:00
Michael Telatynski	272f06d57a	Fix Space Panel exploding with cyclic hierarchies	2021-03-15 12:16:48 +00:00
Michael Telatynski	f9eace1729	Rebuild alignment of the menu buttons and notification badges	2021-03-15 11:59:46 +00:00
Michael Telatynski	a2d63f5fb7	Merge pull request #5760 from maunium/allow-details ... Add details and summary to allowed HTML tags	2021-03-15 09:24:28 +00:00
Tulir Asokan	830080c23e	Add details and summary to allowed HTML tags ... Implements MSC2184 (https://github.com/matrix-org/matrix-doc/pull/2184) Signed-off-by: Tulir Asokan <tulir@maunium.net>	2021-03-14 19:34:35 +02:00
Travis Ralston	4811154f25	Remove now-unused assets and CSS from CompleteSecurity step	2021-03-12 15:24:16 -07:00
Travis Ralston	d3541b78eb	Merge pull request #5714 from matrix-org/travis/media-customization ... Support a media handling customisation endpoint	2021-03-12 11:01:59 -07:00
Michael Telatynski	6210614ce7	Rebuild space panel layout to resolve weirdness with selections and nesting	2021-03-12 17:37:15 +00:00
Šimon Brandner	02051a39ff	Hangup all calls on logout ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-12 13:55:14 +01:00
J. Ryan Stinnett	4987359eef	Merge pull request #5718 from panoschal/edit-view-source ... Edit button on View Source dialog that takes you to devtools -> SendCustomEvent	2021-03-12 11:40:54 +00:00
Šimon Brandner	5b65f367d3	Use resourceId in plain body ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-11 11:30:09 -07:00
Šimon Brandner	37b6162c25	Use resourceId in formatted body ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-11 11:30:06 -07:00
Travis Ralston	7c8c85161d	Merge pull request #5748 from SimonBrandner/compat-for-non-rich-text-clients ... Show room alias in plain/formatted body	2021-03-11 11:29:26 -07:00
Šimon Brandner	d4f67d94a4	Use resourceId in plain body ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-11 18:53:06 +01:00
Šimon Brandner	62fa60f109	Use resourceId in formatted body ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-03-11 18:50:54 +01:00
Michael Telatynski	9ac5f4d2ee	Merge pull request #5754 from panoschal/fix/pills-selection-bug ... Allow pills on the beginning of a part string	2021-03-11 17:28:45 +00:00
Panagiotis	a1eabde3a3	fix: create a PillCandidatePart on the beginning of a part string	2021-03-11 19:14:04 +02:00
Travis Ralston	6ab235f10c	Fix tests for new call path ... We have to mock `fetch` for the caching of the download icon, and then mock out all the function calls used by components to feed a Media object.	2021-03-11 09:42:55 -07:00
Travis Ralston	90817f3bc6	Developer documentation ... The lint rules don't currently exist, but would apply to `mxcUrlToHttp` and `getHttpUriForMxc`	2021-03-11 09:19:59 -07:00
Travis Ralston	a9a4bd50ca	Merge branch 'develop' into travis/media-customization	2021-03-11 08:37:49 -07:00
Panagiotis	be7fb33a67	Merge branch 'develop' into edit-view-source	2021-03-11 17:07:56 +02:00
Travis Ralston	229a95f190	Merge pull request #5734 from matrix-org/travis/skinning/pt3-easy-comps ... [SK-3] Decorate easy components with replaceableComponent	2021-03-11 07:26:20 -07:00
J. Ryan Stinnett	b61fd1da64	Merge pull request #5753 from matrix-org/jryans/fsync-reskindex ... Use fsync in reskindex to ensure file is written to disk	2021-03-11 14:19:04 +00:00