318 commits

Author	SHA1	Message	Date
RiotRobot	ddc3f275a8	Reset matrix-js-sdk back to develop branch	2020-11-23 16:41:50 +00:00
RiotRobot	8239649a45	Merge branch 'master' into develop	2020-11-23 16:40:45 +00:00
RiotRobot	be25a0e432	Upgrade matrix-js-sdk to 9.2.0	2020-11-23 16:29:44 +00:00
Travis Ralston	2446fb151a	Update widget-api	2020-11-20 09:05:09 -07:00
RiotRobot	2880083cbb	Upgrade matrix-js-sdk to 9.2.0-rc.1	2020-11-18 15:59:28 +00:00
Travis Ralston	1b6e47c01b	Update widget-api again	2020-11-12 11:52:47 -07:00
Travis Ralston	4bcb932355	Update widget-api	2020-11-12 11:33:44 -07:00
RiotRobot	46e01196f0	Reset matrix-js-sdk back to develop branch	2020-11-09 16:33:48 +00:00
RiotRobot	6f3cdadcdb	Upgrade matrix-js-sdk to 9.1.0	2020-11-09 16:26:36 +00:00
RiotRobot	1b55eb5f44	Upgrade matrix-js-sdk to 9.1.0-rc.1	2020-11-04 14:10:56 +00:00
RiotRobot	a708dbf6e9	Reset matrix-js-sdk back to develop branch	2020-10-28 14:32:26 +00:00
RiotRobot	de6589705c	Upgrade matrix-js-sdk to 9.0.1	2020-10-28 14:17:48 +00:00
RiotRobot	5446184e6e	Upgrade matrix-js-sdk to 9.0.0	2020-10-26 16:49:16 +00:00
RiotRobot	b585cf76bd	Upgrade matrix-js-sdk to 9.0.0-rc.1	2020-10-21 15:16:46 +01:00
RiotRobot	65d7b9c0f2	Upgrade matrix-js-sdk to 8.5.0	2020-10-21 14:38:51 +01:00
RiotRobot	bd1276c56b	Reset matrix-js-sdk back to develop branch	2020-10-20 11:27:33 +01:00
J. Ryan Stinnett	d6a166d3bf	Upgrade widget API	2020-10-19 16:56:36 +01:00
RiotRobot	d007b06d7c	Reset matrix-js-sdk back to develop branch	2020-10-12 13:40:23 +01:00
RiotRobot	ddd3d97b71	Merge branch 'master' into develop	2020-10-12 13:39:18 +01:00
RiotRobot	0ac4f21652	Upgrade matrix-js-sdk to 8.5.0	2020-10-12 13:24:53 +01:00
Travis Ralston	2caf679024	Update widget-api	2020-10-08 21:22:17 -06:00
Travis Ralston	25db3e9efa	Update widget-api	2020-10-08 21:21:11 -06:00
Michael Telatynski	177b76d882	Merge pull request #5284 from matrix-org/t3chguy/fix/10353 ... Track replyToEvent along with Cider state & history	2020-10-08 14:59:14 +01:00
J. Ryan Stinnett	f77dace173	Shake lock file to attempt fixing CI	2020-10-07 17:07:44 +01:00
RiotRobot	2fd9b9b3b9	Upgrade matrix-js-sdk to 8.5.0-rc.1	2020-10-07 14:23:52 +01:00
Michael Telatynski	0d6edab708	Workaround Jest bug with ArrayBuffers ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-10-07 01:22:29 +01:00
Michael Telatynski	13afb8d4f1	Update Jest and JSDOM ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-10-07 00:08:40 +01:00
Travis Ralston	08c5e9e039	Use the beta release of the widget-api	2020-09-30 20:42:37 -06:00
RiotRobot	524b2dbd22	Reset matrix-js-sdk back to develop branch	2020-09-28 16:20:07 +01:00
RiotRobot	a16ca8226c	Upgrade matrix-js-sdk to 8.4.1	2020-09-28 16:12:05 +01:00
RiotRobot	fe5e1f4543	Upgrade matrix-js-sdk to 8.4.0	2020-09-28 14:25:51 +01:00
RiotRobot	ca4b11ec6a	Upgrade matrix-js-sdk to 8.4.0-rc.1	2020-09-23 15:27:40 +01:00
J. Ryan Stinnett	064ae187e2	Upgrade sanitize-html, set nesting limit ... This uses the recently added option to allow specifying a nesting limit. Fixes https://github.com/vector-im/element-web/issues/15122	2020-09-22 18:06:10 +01:00
Michael Telatynski	d59a1fbd80	Merge pull request #5179 from matrix-org/t3chguy/tidy-dev-deps ... Tidy devDeps, all the webpack stuff lives in the layer above	2020-09-17 15:06:16 +01:00
RiotRobot	148cad6ea2	Reset matrix-js-sdk back to develop branch	2020-09-14 13:42:34 +01:00
RiotRobot	ba73847296	Upgrade matrix-js-sdk to 8.3.0	2020-09-14 13:31:41 +01:00
RiotRobot	cc353dbe43	Upgrade matrix-js-sdk to 8.3.0-rc.1	2020-09-09 15:13:40 +01:00
Michael Telatynski	b878c27741	Tidy devDeps, all the webpack stuff lives in the layer above	2020-09-08 16:56:22 +01:00
Jason Robinson	db2e1a9cd0	Add rfc4648 (base64/32/16) encoder to dependencies	2020-09-04 10:04:18 +03:00
RiotRobot	0d290c9bd2	Reset matrix-js-sdk back to develop branch	2020-09-01 17:39:09 +01:00
RiotRobot	bb248670a6	Upgrade matrix-js-sdk to 8.2.0	2020-09-01 17:02:49 +01:00
RiotRobot	b142d72e97	Upgrade matrix-js-sdk to 8.2.0-rc.1	2020-08-26 11:52:28 +01:00
Travis Ralston	0a4d4e4df3	Revert "update js-sdk reference in lockfile" ... This reverts commit cac4e6c920.	2020-08-18 12:53:43 -06:00
Travis Ralston	cac4e6c920	update js-sdk reference in lockfile	2020-08-18 12:50:25 -06:00
Michael Telatynski	8cff59f123	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs	2020-08-18 17:36:04 +01:00
RiotRobot	c91fc99d4b	Reset matrix-js-sdk back to develop branch	2020-08-17 13:08:45 +01:00
RiotRobot	32ca810809	Upgrade matrix-js-sdk to 8.1.0	2020-08-17 12:53:33 +01:00
RiotRobot	47bb6d0b25	Upgrade matrix-js-sdk to 8.1.0-rc.1	2020-08-13 12:12:10 +01:00
Michael Telatynski	df980dbf92	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs	2020-08-12 22:48:03 +01:00
RiotRobot	45b79a0b7c	Reset matrix-js-sdk back to develop branch	2020-08-05 16:11:28 +01:00