Commit Graph

1110 Commits

Author SHA1 Message Date
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
e85ca92904 v3.9.0-rc.1 2020-11-18 16:27:04 +00: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
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
Michael Telatynski
b878c27741 Tidy devDeps, all the webpack stuff lives in the layer above 2020-09-08 16:56:22 +01:00
Jason Robinson
75518254fb
Merge pull request #5173 from matrix-org/jaywink/jitsi-openidjwt-auth
Support creation of Jitsi widgets with "openidtoken-jwt" auth
2020-09-08 17:16:50 +03:00
Jason Robinson
db2e1a9cd0 Add rfc4648 (base64/32/16) encoder to dependencies 2020-09-04 10:04:18 +03:00
Michael Telatynski
e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1
Remove create-react-class
2020-09-03 17:21:58 +01:00
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
bb248670a6 Upgrade matrix-js-sdk to 8.2.0 2020-09-01 17:02:49 +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
RiotRobot
d0358ab196 v3.3.0-rc.1 2020-08-26 12:02:11 +01:00
RiotRobot
b142d72e97 Upgrade matrix-js-sdk to 8.2.0-rc.1 2020-08-26 11:52:28 +01: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
ea337465ae v3.2.0 2020-08-17 12:59:51 +01:00
RiotRobot
32ca810809 Upgrade matrix-js-sdk to 8.1.0 2020-08-17 12:53:33 +01:00
RiotRobot
8e8a2e602b v3.2.0-rc.1 2020-08-13 12:17:59 +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
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
57814a40c1 Upgrade matrix-js-sdk to 8.0.1 2020-08-05 15:50:03 +01:00
Michael Telatynski
cbcac9dd49 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
 Conflicts:
	package.json
2020-08-03 12:54:06 +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
RiotRobot
d08a08daeb v3.1.0-rc.1 2020-07-31 13:30:45 +01:00
RiotRobot
31c66a1128 Upgrade matrix-js-sdk to 8.0.1-rc.1 2020-07-31 13:24:17 +01:00
J. Ryan Stinnett
50bc7fc62f Remove redundant lint dependencies
These are no longer needed with the new standard lint repo.
2020-07-29 12:00:42 +01:00
RiotRobot
96ba645cbd Reset matrix-js-sdk back to develop branch 2020-07-27 21:29:22 +01:00
RiotRobot
f7444a13b4 v3.0.0 2020-07-27 21:18:15 +01:00
RiotRobot
ebb4d2ff87 Upgrade matrix-js-sdk to 8.0.0 2020-07-27 21:05:55 +01:00
Travis Ralston
66eb069651 Pin flow-parser for i18n 2020-07-23 15:43:53 -06:00
Travis Ralston
9d091e5e02 Update packages to modern versions 2020-07-23 15:27:10 -06:00
Michael Telatynski
c4fc70b9be Post-merge fix
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 22:28:36 +01:00
Michael Telatynski
70c81cc377 Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs
 Conflicts:
	src/i18n/strings/en_EN.json
	src/rageshake/submit-rageshake.ts
2020-07-21 22:22:28 +01:00
Jorik Schellekens
6219e67a8a add dep eslint-config-matrix-org 2020-07-20 21:19:49 +01:00
Jorik Schellekens
b3fa855bd8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config 2020-07-20 16:22:32 +01:00
RiotRobot
2f9bfdbb69 Reset matrix-js-sdk back to develop branch 2020-07-16 16:11:59 +01:00
RiotRobot
0c89b8d267 v2.10.1 2020-07-16 16:09:41 +01:00
RiotRobot
bc97f731fc Upgrade matrix-js-sdk to 7.1.0 2020-07-16 16:03:00 +01:00
RiotRobot
7098cbfce1 Reset matrix-js-sdk back to develop branch 2020-07-15 12:01:14 +01:00
RiotRobot
a842e0936e v2.10.0 2020-07-15 11:49:38 +01:00
RiotRobot
c339e5cbf9 Upgrade matrix-js-sdk to 7.1.0 2020-07-15 11:40:31 +01:00