Commit graph

369 commits

Author SHA1 Message Date
Sebastian Denz
7f4f9b2cf1 Use HTTPS_PROXY environment variable for downloading external_api.min.js if set 2020-10-16 14:48:28 +02:00
RiotRobot
f8e84c42ad Reset matrix-react-sdk back to develop branch 2020-10-12 13:59:58 +01:00
RiotRobot
fd2895eb40 Reset matrix-js-sdk back to develop branch 2020-10-12 13:59:47 +01:00
RiotRobot
2d03ccfa57 Upgrade matrix-react-sdk to 3.6.0 2020-10-12 13:40:53 +01:00
RiotRobot
ed86341ba5 Upgrade matrix-js-sdk to 8.5.0 2020-10-12 13:40:35 +01:00
RiotRobot
b5f114c157 Upgrade matrix-react-sdk to 3.6.0-rc.1 2020-10-07 14:39:28 +01:00
RiotRobot
27ff4e9488 Upgrade matrix-js-sdk to 8.5.0-rc.1 2020-10-07 14:36:06 +01:00
Michael Telatynski
25eb587e3b
Merge pull request #15402 from vector-im/t3chguy/fix/10353
Update Jest and JSDOM
2020-10-07 10:43:43 +01:00
Michael Telatynski
07c0b20075 Update Jest and JSDOM
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:08:41 +01:00
Hubert Chathi
72aeb6ea5d bump olm version again 2020-10-06 18:04:13 -04:00
Hubert Chathi
520e6e5fef update yarn.lock 2020-10-06 15:33:39 -04:00
Travis Ralston
5f353c4907
Merge pull request #15102 from vector-im/travis/widget-api
Switch to using the Widget API SDK for Jitsi widgets
2020-10-01 10:16:11 -06:00
Michael Telatynski
ad95d1fa64 Update yarn.lock
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-01 14:06:28 +01:00
Michael Telatynski
cfee4c925a Revert "Attempt to fix tests some more"
This reverts commit c76a5f2c

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-01 14:05:07 +01:00
Travis Ralston
408766366c Use the beta release of the widget-api 2020-09-30 20:43:21 -06:00
RiotRobot
11600238ed Merge branch 'master' into develop 2020-09-28 16:33:11 +01:00
RiotRobot
4d84df11c4 Upgrade matrix-react-sdk to 3.5.0 2020-09-28 16:25:04 +01:00
RiotRobot
191fd2fb2d Upgrade matrix-js-sdk to 8.4.1 2020-09-28 16:24:30 +01:00
Michael Telatynski
477b7a362b
Merge pull request #15196 from vector-im/t3chguy/fix/12591
Replace dummy sw.js with pre-caching and runtime-caching workbox SW
2020-09-23 17:03:26 +01:00
RiotRobot
b0de2d9108 Upgrade matrix-react-sdk to 3.5.0-rc.1 2020-09-23 15:35:23 +01:00
RiotRobot
6223d0742d Upgrade matrix-js-sdk to 8.4.0-rc.1 2020-09-23 15:35:02 +01:00
J. Ryan Stinnett
9e7ff5e126 Upgrade sanitize-html
Part of https://github.com/vector-im/element-web/issues/15122
2020-09-22 18:07:17 +01:00
Michael Telatynski
c76a5f2c52 Attempt to fix tests some more 2020-09-15 13:19:47 +01:00
RiotRobot
df5cb15cf9 Reset matrix-react-sdk back to develop branch 2020-09-14 16:10:18 +01:00
RiotRobot
62bfc35a8d Merge branch 'master' into develop 2020-09-14 16:09:30 +01:00
RiotRobot
0eccd03a78 Upgrade matrix-react-sdk to 3.4.1 2020-09-14 15:57:32 +01:00
RiotRobot
8b2560dbef Reset matrix-react-sdk back to develop branch 2020-09-14 13:51:40 +01:00
RiotRobot
451842f2bf Reset matrix-js-sdk back to develop branch 2020-09-14 13:51:31 +01:00
RiotRobot
cd392425a4 Merge branch 'master' into develop 2020-09-14 13:49:30 +01:00
RiotRobot
6d124e6c28 Upgrade matrix-react-sdk to 3.4.0 2020-09-14 13:44:41 +01:00
RiotRobot
c8a0d94b61 Upgrade matrix-js-sdk to 8.3.0 2020-09-14 13:42:53 +01:00
dependabot[bot]
d1aed25815
Bump node-fetch from 2.6.0 to 2.6.1
Bumps [node-fetch](https://github.com/bitinn/node-fetch) from 2.6.0 to 2.6.1.
- [Release notes](https://github.com/bitinn/node-fetch/releases)
- [Changelog](https://github.com/node-fetch/node-fetch/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/bitinn/node-fetch/compare/v2.6.0...v2.6.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-11 11:02:13 +00:00
RiotRobot
2ad02e4feb Upgrade matrix-react-sdk to 3.4.0-rc.1 2020-09-09 15:56:58 +01:00
RiotRobot
fcdda7a956 Upgrade matrix-js-sdk to 8.3.0-rc.1 2020-09-09 15:56:42 +01:00
Jason Robinson
5108697ac8 Add support for Jitsi openidtoken-jwt auth
If the widget URL specifies this auth, generate a JWT token
containing the info needed by the Jitsi backend.
2020-09-04 13:14:52 +03:00
RiotRobot
e5a4092adc Reset matrix-react-sdk back to develop branch 2020-09-01 17:51:03 +01:00
RiotRobot
3ed750a9ab Reset matrix-js-sdk back to develop branch 2020-09-01 17:50:49 +01:00
RiotRobot
a20b9c4c24 Upgrade matrix-react-sdk to 3.3.0 2020-09-01 17:41:33 +01:00
RiotRobot
a09ab52be3 Upgrade matrix-js-sdk to 8.2.0 2020-09-01 17:40:19 +01:00
RiotRobot
9163aee0fc Upgrade matrix-react-sdk to 3.3.0-rc.1 2020-08-26 12:10:33 +01:00
RiotRobot
de4550099e Upgrade matrix-js-sdk to 8.2.0-rc.1 2020-08-26 12:08:33 +01:00
RiotRobot
d969a96cd2 Reset matrix-react-sdk back to develop branch 2020-08-17 13:17:44 +01:00
RiotRobot
4a7c2318dd Reset matrix-js-sdk back to develop branch 2020-08-17 13:17:27 +01:00
RiotRobot
5ac891d70e Upgrade matrix-react-sdk to 3.2.0 2020-08-17 13:09:23 +01:00
RiotRobot
16be9e4774 Upgrade matrix-js-sdk to 8.1.0 2020-08-17 13:09:04 +01:00
RiotRobot
871733388c Upgrade matrix-react-sdk to 3.2.0-rc.1 2020-08-13 12:20:41 +01:00
RiotRobot
89ee32a32d Upgrade matrix-js-sdk to 8.1.0-rc.1 2020-08-13 12:20:15 +01:00
RiotRobot
04afd0232b Reset matrix-react-sdk back to develop branch 2020-08-05 16:20:15 +01:00
RiotRobot
5935e3b145 Reset matrix-js-sdk back to develop branch 2020-08-05 16:20:01 +01:00
RiotRobot
6b7909c732 Upgrade matrix-react-sdk to 3.1.0 2020-08-05 16:12:43 +01:00
RiotRobot
d283b4161c Upgrade matrix-js-sdk to 8.0.1 2020-08-05 16:12:29 +01:00
RiotRobot
7f0c8216ae Upgrade matrix-react-sdk to 3.1.0-rc.1 2020-07-31 13:35:05 +01:00
RiotRobot
6004d02b98 Upgrade matrix-js-sdk to 8.0.1-rc.1 2020-07-31 13:33:19 +01:00
J. Ryan Stinnett
703179be22
Merge pull request #14810 from vector-im/jryans/cleanup-lint-deps
Remove redundant lint dependencies
2020-07-31 11:42:49 +01:00
dependabot[bot]
6f688102e7
Bump elliptic from 6.5.2 to 6.5.3
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-30 12:58:42 +00:00
J. Ryan Stinnett
269e82edc9 Remove redundant lint dependencies
These are no longer needed with the new standard lint repo.
2020-07-29 12:05:50 +01:00
RiotRobot
f4e6828949 Reset matrix-react-sdk back to develop branch 2020-07-27 21:39:12 +01:00
RiotRobot
b799a6eb84 Reset matrix-js-sdk back to develop branch 2020-07-27 21:39:01 +01:00
RiotRobot
36802afe92 Upgrade matrix-react-sdk to 3.0.0 2020-07-27 21:30:30 +01:00
RiotRobot
c20776a264 Upgrade matrix-js-sdk to 8.0.0 2020-07-27 21:30:13 +01:00
Jorik Schellekens
9bb1f99bd9 Confiure eslint package and fix lint issues 2020-07-21 11:30:28 +01:00
J. Ryan Stinnett
8ae4298637 Webpack modes also manage NODE_ENV
We don't need to manually define `NODE_ENV` in the Webpack config, nor do we
need to set it outside Webpack with `cross-env` either, as Webpack's modes will
take care of this for us.
2020-07-17 14:18:08 +01:00
dependabot[bot]
eaebafc29a
Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 19:40:00 +00:00
RiotRobot
dbd82c7425 Reset matrix-react-sdk back to develop branch 2020-07-16 16:20:02 +01:00
RiotRobot
da5008bab1 Reset matrix-js-sdk back to develop branch 2020-07-16 16:19:49 +01:00
RiotRobot
0159699d1b Upgrade matrix-react-sdk to 2.10.1 2020-07-16 16:13:15 +01:00
RiotRobot
1262a1ef08 Upgrade matrix-js-sdk to 7.1.0 2020-07-16 16:12:35 +01:00
RiotRobot
7c17272c83 Reset matrix-react-sdk back to develop branch 2020-07-15 12:14:38 +01:00
RiotRobot
6886dbcbd4 Reset matrix-js-sdk back to develop branch 2020-07-15 12:14:27 +01:00
RiotRobot
e5398f4345 Upgrade matrix-react-sdk to 2.10.0 2020-07-15 12:05:47 +01:00
RiotRobot
e077bea046 Upgrade matrix-js-sdk to 7.1.0 2020-07-15 12:05:31 +01:00
RiotRobot
449ac2e5e4 Reset matrix-react-sdk back to develop branch 2020-07-03 13:37:33 +01:00
RiotRobot
ebe1d7c336 Reset matrix-js-sdk back to develop branch 2020-07-03 13:37:22 +01:00
RiotRobot
7815810cf8 Upgrade matrix-react-sdk to 2.9.0 2020-07-03 13:31:26 +01:00
RiotRobot
14fc25e635 Upgrade matrix-js-sdk to 7.1.0 2020-07-03 13:30:52 +01:00
RiotRobot
a14cff6539 Upgrade matrix-react-sdk to 2.9.0-rc.1 2020-07-01 14:37:15 +01:00
RiotRobot
003a2942fe Upgrade matrix-js-sdk to 7.1.0-rc.1 2020-07-01 14:34:47 +01:00
RiotRobot
af349a7ac5 Reset matrix-react-sdk back to develop branch 2020-06-29 16:23:35 +01:00
RiotRobot
d4fa099877 Reset matrix-js-sdk back to develop branch 2020-06-29 16:23:22 +01:00
RiotRobot
98f1536d45 Merge branch 'master' into develop 2020-06-29 16:22:44 +01:00
RiotRobot
ec49f4555b Upgrade matrix-react-sdk to 2.8.1 2020-06-29 16:15:21 +01:00
RiotRobot
2000f420bd Reset matrix-react-sdk back to develop branch 2020-06-23 15:31:49 +01:00
RiotRobot
979ce51208 Reset matrix-js-sdk back to develop branch 2020-06-23 15:31:35 +01:00
RiotRobot
b1c106e8b2 Upgrade matrix-react-sdk to 2.8.0 2020-06-23 15:20:43 +01:00
RiotRobot
ae7f354811 Upgrade matrix-js-sdk to 7.0.0 2020-06-23 15:20:24 +01:00
RiotRobot
d587a8e910 Upgrade matrix-react-sdk to 2.8.0-rc.1 2020-06-17 21:49:25 +01:00
RiotRobot
2c227f68d4 Upgrade matrix-js-sdk to 7.0.0-rc.1 2020-06-17 21:49:00 +01:00
RiotRobot
59d37ec94b Reset matrix-react-sdk back to develop branch 2020-06-16 12:01:07 +01:00
RiotRobot
6558d6d828 Reset matrix-js-sdk back to develop branch 2020-06-16 12:00:53 +01:00
RiotRobot
754d849055 Merge branch 'master' into develop 2020-06-16 12:00:14 +01:00
RiotRobot
9ed7c96df6 Upgrade matrix-react-sdk to 2.7.2 2020-06-16 11:51:28 +01:00
RiotRobot
93da1f192b Upgrade matrix-js-sdk to 6.2.2 2020-06-16 11:51:11 +01:00
J. Ryan Stinnett
7d800f9f38 Upgrade deps 2020-06-08 10:16:33 +01:00
dependabot[bot]
e8ebf886e4
Bump websocket-extensions from 0.1.3 to 0.1.4
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-06 13:56:59 +00:00
RiotRobot
6875ffe0d5 Reset matrix-react-sdk back to develop branch 2020-06-05 16:03:24 +01:00
RiotRobot
befc7589cd Reset matrix-js-sdk back to develop branch 2020-06-05 16:03:09 +01:00
RiotRobot
21dd4c99f3 Upgrade matrix-react-sdk to 2.7.1 2020-06-05 15:53:38 +01:00
RiotRobot
45fb8adc5d Upgrade matrix-js-sdk to 6.2.1 2020-06-05 15:52:31 +01:00
RiotRobot
451138617b Upgrade matrix-react-sdk to 2.7.0 2020-06-04 15:23:38 +01:00
RiotRobot
a0ea1bfda8 Upgrade matrix-js-sdk to 6.2.0 2020-06-04 15:23:02 +01:00