Commit Graph

415 Commits (b2b95257a8571edde2cf1a7ed110eb1a65652252)

Author SHA1 Message Date
RiotRobot f4ab4dce40 Merge branch 'master' into develop 2021-02-16 11:06:42 +00:00
RiotRobot f9d4d679ee Upgrade matrix-js-sdk to 9.7.0 2021-02-16 10:59:39 +00:00
Travis Ralston cd82d97c3e Use randomly generated conference names for Jitsi
Fixes https://github.com/vector-im/element-web/issues/15205
Replaces https://github.com/matrix-org/matrix-react-sdk/pull/5322

This change uses a random ID for the Jitsi conference name to avoid any badly-named Jitsi calls, and overrides the "subject" (title) of the call so end users aren't typically exposed to the random ID.
2021-02-15 08:53:37 -07:00
RiotRobot 673717d6c0 Upgrade matrix-js-sdk to 9.7.0-rc.1 2021-02-10 15:57:57 +00:00
RiotRobot bd538823cf Reset matrix-js-sdk back to develop branch 2021-02-03 12:11:07 +00:00
RiotRobot 41c18d0d24 Upgrade matrix-js-sdk to 9.6.0 2021-02-03 12:02:50 +00:00
J. Ryan Stinnett ad2a187566 Upgrade matrix-widget-api 2021-02-02 15:16:43 +00:00
RiotRobot 815a126b56 Upgrade matrix-js-sdk to 9.6.0-rc.1 2021-01-29 17:23:17 +00:00
Travis Ralston 5d4c38188c Update widget-api to beta.12 2021-01-28 20:42:48 -07:00
J. Ryan Stinnett 84b1f2e6c6 Resolve typing errors after TypeScript upgrade 2021-01-27 12:42:37 +00:00
J. Ryan Stinnett ea706189a2 Nested upgrades via `yarn upgrade` 2021-01-27 12:34:10 +00:00
J. Ryan Stinnett 0cb266eda2 lolex renamed to @sinonjs/fake-timers 2021-01-27 12:31:37 +00:00
J. Ryan Stinnett ca08475498 Apply all simple major version upgrades 2021-01-27 12:31:37 +00:00
J. Ryan Stinnett f8816e0bda Pin React types to 16.x for now
This avoids type conflicts from other deps that depends on just `*`. Type deps
needs to be de-duplicated down to a single version to avoid errors (unlike code
deps).
2021-01-27 12:31:37 +00:00
J. Ryan Stinnett 12c671045d Upgrade to latest minor versions of deps 2021-01-27 12:31:37 +00:00
RiotRobot 4dbdeb46ad Reset matrix-js-sdk back to develop branch 2021-01-26 12:11:47 +00:00
RiotRobot e21514cea0 Merge branch 'master' into develop 2021-01-26 12:08:24 +00:00
RiotRobot 709fc2e004 Upgrade matrix-js-sdk to 9.5.1 2021-01-26 11:57:46 +00:00
Travis Ralston 83fb698bbc
Merge pull request #5527 from matrix-org/travis/widget-nav
Wire up MSC2931 widget navigation
2021-01-18 09:09:32 -07:00
RiotRobot 6c8e6096da Reset matrix-js-sdk back to develop branch 2021-01-18 15:16:31 +00:00
RiotRobot c4570cdaee Upgrade matrix-js-sdk to 9.5.0 2021-01-18 15:09:22 +00:00
Travis Ralston f6a328a55b Update widget api 2021-01-16 23:34:16 -07:00
RiotRobot 30dd24a59c Upgrade matrix-js-sdk to 9.5.0-rc.1 2021-01-13 12:59:37 +00:00
David Baker 328d64ac23 Run TypeScript tests
There aren't any yet, but I'm about to write a test and it's going
to be in TypeScript and I don't want to lump this change in with
a bunch of other stuff.
2021-01-12 17:37:24 +00:00
Travis Ralston 777c0ca1ef
Merge pull request #5520 from matrix-org/dependabot/npm_and_yarn/node-notifier-8.0.1
Bump node-notifier from 8.0.0 to 8.0.1
2020-12-22 08:45:36 -07:00
RiotRobot c4f7269321 Reset matrix-js-sdk back to develop branch 2020-12-21 17:52:30 +00:00
RiotRobot 8e6f8b11df Merge branch 'master' into develop 2020-12-21 17:51:09 +00:00
RiotRobot cc0bef7f8d Upgrade matrix-js-sdk to 9.4.1 2020-12-21 17:36:46 +00:00
dependabot[bot] 9af2138171
Bump node-notifier from 8.0.0 to 8.0.1
Bumps [node-notifier](https://github.com/mikaelbr/node-notifier) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases)
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md)
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v8.0.0...v8.0.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-21 17:19:21 +00:00
RiotRobot e551e7ac40 Reset matrix-js-sdk back to develop branch 2020-12-21 17:08:51 +00:00
RiotRobot 55fd463a9d Merge branch 'master' into develop 2020-12-21 17:07:52 +00:00
RiotRobot 78e6fb9121 Upgrade matrix-js-sdk to 9.4.0 2020-12-21 17:00:39 +00:00
RiotRobot d2ee89fa74 Upgrade matrix-js-sdk to 9.4.0-rc.2 2020-12-16 15:57:56 +00:00
RiotRobot 9f8a5f5107 Upgrade matrix-js-sdk to 9.4.0-rc.1 2020-12-16 14:22:44 +00:00
dependabot[bot] 456d21c9e7
Bump ini from 1.3.5 to 1.3.7
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 02:56:41 +00:00
J. Ryan Stinnett 49bd7887d2 Add Olm as a dev dependency for types
Fixes https://github.com/vector-im/element-web/issues/15803
2020-12-08 16:18:12 +00:00
J. Ryan Stinnett 07a1754768
Merge pull request #5472 from matrix-org/dependabot/npm_and_yarn/highlight.js-10.4.1
Bump highlight.js from 10.1.2 to 10.4.1
2020-12-07 12:58:21 +00:00
RiotRobot 7d41604569 Reset matrix-js-sdk back to develop branch 2020-12-07 12:33:18 +00:00
RiotRobot 1241b7c335 Upgrade matrix-js-sdk to 9.3.0 2020-12-07 12:13:04 +00:00
dependabot[bot] 58eaccbba8
Bump highlight.js from 10.1.2 to 10.4.1
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 10.1.2 to 10.4.1.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/10.1.2...10.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-04 17:35:40 +00:00
RiotRobot ed59b50448 Upgrade matrix-js-sdk to 9.3.0-rc.1 2020-12-02 14:25:55 +00:00
J. Ryan Stinnett 826466179a
Merge pull request #5244 from akissinger/katex
LaTeX rendering in element-web using KaTeX
2020-11-27 11:55:26 +00:00
Travis Ralston 67a0f1ef4c Update widget API 2020-11-24 09:43:21 -07:00
RiotRobot ddc3f275a8 Reset matrix-js-sdk back to develop branch 2020-11-23 16:41:50 +00:00
RiotRobot 8239649a45 Merge branch 'master' into develop 2020-11-23 16:40:45 +00:00
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 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 6f3cdadcdb Upgrade matrix-js-sdk to 9.1.0 2020-11-09 16:26:36 +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 de6589705c Upgrade matrix-js-sdk to 9.0.1 2020-10-28 14:17:48 +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
RiotRobot b585cf76bd Upgrade matrix-js-sdk to 9.0.0-rc.1 2020-10-21 15:16:46 +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
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
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
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
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 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