Commit Graph

1054 Commits (494ae3e4215cc2fe0583c316b8ea1d895503d39e)

Author SHA1 Message Date
Aleks Kissinger 5f3af7863a Merge branch 'develop' into katex 2020-11-10 18:19:20 +00:00
RiotRobot 46e01196f0 Reset matrix-js-sdk back to develop branch 2020-11-09 16:33:48 +00:00
RiotRobot 8edbc7c654 v3.8.0 2020-11-09 16:31:48 +00:00
RiotRobot 6f3cdadcdb Upgrade matrix-js-sdk to 9.1.0 2020-11-09 16:26:36 +00:00
RiotRobot 8257470383 v3.8.0-rc.1 2020-11-04 14:16:13 +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 bdfac1d858 v3.7.1 2020-10-28 14:25:35 +00:00
RiotRobot de6589705c Upgrade matrix-js-sdk to 9.0.1 2020-10-28 14:17:48 +00:00
RiotRobot 492f85da00 v3.7.0 2020-10-26 16:55:16 +00:00
RiotRobot 5446184e6e Upgrade matrix-js-sdk to 9.0.0 2020-10-26 16:49:16 +00:00
Aleks Kissinger 4536f51ec0 Merge branch 'develop' into katex 2020-10-25 12:28:17 +00:00
Aleks Kissinger 173d798865 added cheerio as explicit dep in package.json 2020-10-23 18:41:24 +01:00
RiotRobot 5c7e9e8a46 v3.7.0-rc.2 2020-10-21 15:21:44 +01:00
RiotRobot b585cf76bd Upgrade matrix-js-sdk to 9.0.0-rc.1 2020-10-21 15:16:46 +01:00
RiotRobot 2f3eb0cd01 v3.7.0-rc.1 2020-10-21 14:44:21 +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
RiotRobot 2d5528fccd Merge branch 'master' into develop 2020-10-20 11:26:23 +01:00
RiotRobot 3b90ed0664 v3.6.1 2020-10-20 11:23:48 +01:00
J. Ryan Stinnett 2219419f52 Upgrade widget API 2020-10-19 17:41:04 +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 2242e6b8c6 v3.6.0 2020-10-12 13:36:52 +01:00
RiotRobot 0ac4f21652 Upgrade matrix-js-sdk to 8.5.0 2020-10-12 13:24:53 +01:00
Aleks Kissinger aafaf34233 Merge branch 'develop' into katex 2020-10-10 19:31:46 +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
RiotRobot 4abaa107ab v3.6.0-rc.1 2020-10-07 14:30:51 +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 ceb2975c91 v3.5.0 2020-09-28 16:18:15 +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 9ac3af4176 v3.5.0-rc.1 2020-09-23 15:32:47 +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
Aleks Kissinger 0604c86779 added katex package and import 2020-09-19 15:45:35 +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 747126950b Merge branch 'master' into develop 2020-09-14 16:07:54 +01:00
RiotRobot 4f930ac50c v3.4.1 2020-09-14 15:49:09 +01:00
RiotRobot 148cad6ea2 Reset matrix-js-sdk back to develop branch 2020-09-14 13:42:34 +01:00
RiotRobot 099f50b10e v3.4.0 2020-09-14 13:36:32 +01:00
RiotRobot ba73847296 Upgrade matrix-js-sdk to 8.3.0 2020-09-14 13:31:41 +01:00
RiotRobot c5e033d81a v3.4.0-rc.1 2020-09-09 15:53:04 +01:00
RiotRobot cc353dbe43 Upgrade matrix-js-sdk to 8.3.0-rc.1 2020-09-09 15:13:40 +01:00