Commit Graph

303 Commits (5cd1a28d131ded53babcea765f12d8c2aace4c5e)

Author SHA1 Message Date
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
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 31c66a1128 Upgrade matrix-js-sdk to 8.0.1-rc.1 2020-07-31 13:24:17 +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] 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
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 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