Commit Graph

3275 Commits

Author SHA1 Message Date
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
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
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
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 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
Jason Robinson db2e1a9cd0 Add rfc4648 (base64/32/16) encoder to dependencies 2020-09-04 10:04:18 +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 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 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 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 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 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 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 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 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 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 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 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
RiotRobot 31c66a1128 Upgrade matrix-js-sdk to 8.0.1-rc.1 2020-07-31 13:24:17 +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
J. Ryan Stinnett 0404c7d9ae Merge pull request #5059 from matrix-org/jryans/cleanup-lint-deps
Remove redundant lint dependencies
2020-07-31 11:42:29 +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
dependabot[bot] 8610760288 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:52:17 +00:00