28065 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
RiotRobot	0d290c9bd2	Reset matrix-js-sdk back to develop branch	2020-09-01 17:39:09 +01:00
RiotRobot	52691a1a42	Merge branch 'master' into develop	2020-09-01 17:38:21 +01:00
RiotRobot	9df5371dca	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop	2020-09-01 17:37:52 +01:00
RiotRobot	d1d823dcc7	v3.3.0	2020-09-01 17:36:21 +01:00
RiotRobot	69e5ed56ae	Prepare changelog for v3.3.0	2020-09-01 17:36:20 +01:00
RiotRobot	bb248670a6	Upgrade matrix-js-sdk to 8.2.0	2020-09-01 17:02:49 +01:00
Michael Telatynski	7c4a84aae0	Merge pull request #5155 from matrix-org/t3chguy/lint-ts ... Fix eslint ts override tsx matching and delint	2020-09-01 16:44:22 +01:00
Michael Telatynski	d668f8018b	undo some delint	2020-09-01 15:59:19 +01:00
Michael Telatynski	6c39213116	remove unused class TextHighlighter	2020-09-01 15:37:07 +01:00
Michael Telatynski	a13cc0ce6a	Merge pull request #5159 from matrix-org/t3chguy/react-err ... Fix react error about functional components can't take refs	2020-09-01 09:13:42 +01:00
Michael Telatynski	3b68da5f42	Merge pull request #5156 from matrix-org/t3chguy/crc ... Remove redundant components and devDependencies	2020-09-01 09:12:46 +01:00
Michael Telatynski	842821b038	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/lodash	2020-09-01 09:09:50 +01:00
Michael Telatynski	656a815991	delint some more	2020-09-01 09:07:46 +01:00
Travis Ralston	78d5b87fbc	Use a different border variable for compatibility with custom themes	2020-08-31 11:20:28 -06:00
Travis Ralston	b4f62e9c88	use valid jsdoc	2020-08-31 11:07:29 -06:00
Travis Ralston	29089821f4	Merge branch 'develop' into travis/copy2	2020-08-31 11:03:01 -06:00
Travis Ralston	7f7414ed5a	Appease the linter	2020-08-31 10:59:37 -06:00
Travis Ralston	fdbaddbace	Add a simple edit dialog for communities	2020-08-31 10:52:08 -06:00
Travis Ralston	133f981fa8	Run the tag selection behaviour through the prototype store too	2020-08-31 10:22:29 -06:00
Travis Ralston	724e3f6905	Run all selected prototype community logic through one store	2020-08-31 10:19:05 -06:00
Travis Ralston	93d67a6689	Wire up members button to member view ... Ideally this would open up the group members panel, but that's exceedingly difficult. Instead, we switch to the general chat and rename the button to be a bit more helpful.	2020-08-31 10:12:12 -06:00
dkanada	8cae2fa0aa	update translations with new command string	2020-08-30 15:17:21 +09:00
Michael Telatynski	3c5eb1f42c	fix Registration Form	2020-08-29 18:28:15 +01:00
Michael Telatynski	da97d8885b	Fix react error about functional components can't take props	2020-08-29 13:51:43 +01:00
Michael Telatynski	85f2f46d13	fix tests	2020-08-29 13:38:28 +01:00
Michael Telatynski	646c9f1a83	Fix this contexts	2020-08-29 13:19:05 +01:00
Michael Telatynski	c120458b81	fix test stub	2020-08-29 13:02:45 +01:00
Michael Telatynski	517dee413e	Delint	2020-08-29 12:57:11 +01:00
Michael Telatynski	78812b6f85	Fix some stuff	2020-08-29 12:53:04 +01:00
dkanada	bc9ea04118	add lenny face command	2020-08-29 20:29:43 +09:00
Michael Telatynski	34b960d8cb	fix naming conflict	2020-08-29 12:17:50 +01:00
Michael Telatynski	e2ec89c39d	Merge branch 't3chguy/crc' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/crc1	2020-08-29 12:16:54 +01:00
Michael Telatynski	ac9108a9a6	i18n	2020-08-29 12:16:14 +01:00
Michael Telatynski	72498df28f	Remove create-react-class	2020-08-29 12:14:16 +01:00
Michael Telatynski	672d0fe97b	Remove redundant components and devDependencies	2020-08-29 12:09:07 +01:00
Travis Ralston	281e2ab27b	Null guard new function to reduce error spam	2020-08-28 20:13:26 -06:00
Travis Ralston	275ff6b41e	Wire up the invite button	2020-08-28 20:08:12 -06:00
Travis Ralston	35e4d89545	Add aria labels to menu options	2020-08-28 20:04:19 -06:00
Michael Telatynski	9ba33c7f80	Fix eslint ts override tsx matching and delint	2020-08-29 01:11:08 +01:00
Travis Ralston	02095389e7	Add structure for mixed prototype UserMenu	2020-08-28 17:03:17 -06:00
Travis Ralston	01b0acbe62	Make the UserMenu echo the current community name	2020-08-28 16:14:08 -06:00
Travis Ralston	0ffa548864	Change the menu button to a chevron ... by design request	2020-08-28 15:37:23 -06:00
Travis Ralston	90d9d7128d	Use FlairStore's cache for group naming ... Turns out GroupStore doesn't really know much.	2020-08-28 14:56:59 -06:00
Travis Ralston	e68c4efd0b	Merge branch 'travis/copy2' into travis/communities/proto/userinfo	2020-08-28 13:54:03 -06:00
Travis Ralston	fb54b62be9	Appease the rest of the linter	2020-08-28 13:42:19 -06:00
Travis Ralston	6f237161fd	Appease the linter	2020-08-28 13:28:54 -06:00
Travis Ralston	e58b514803	Add clarifying text to DM dialog about what is about to happen	2020-08-28 13:22:20 -06:00
Michael Telatynski	1fc55b33c1	Stash lodash import optimization	2020-08-28 18:53:43 +01:00
Michael Telatynski	b1cc078543	Merge pull request #5154 from matrix-org/t3chguy/display-capture ... Add display-capture to iframe allow for widgets	2020-08-28 18:18:44 +01:00
Michael Telatynski	2823156ef6	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/display-capture	2020-08-28 17:26:10 +01:00