OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,874 Commits
217 Branches
562 Tags
492 MiB
Commit Graph

541 Commits (f8d21def8682c53b506f22892de5745455827abc)

Author SHA1 Message Date
Michael Telatynski 9133b80f2b
Merge branch 'develop' into t3chguy/spaces 2021-01-29 09:19:40 +00:00
Michael Telatynski 97925a6ad9 Iterate SpacePanel, fix tooltips and give consistent expanded states 2021-01-29 09:16:55 +00:00
Travis Ralston e40fa8823a Update widget-api to beta.12 2021-01-28 20:44:53 -07:00
J. Ryan Stinnett c34a36a9e2 Nested upgrades via `yarn upgrade` 2021-01-27 14:33:53 +00:00
J. Ryan Stinnett d03edb91ea Apply somple major version upgrades 2021-01-27 14:31:17 +00:00
J. Ryan Stinnett ab0677530b Nested upgrades via `yarn upgrade` 2021-01-27 14:17:53 +00:00
J. Ryan Stinnett e7c722bb99 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 14:14:25 +00:00
J. Ryan Stinnett 48613027fc Upgrade to latest minor deps 2021-01-27 14:10:51 +00:00
RiotRobot 089afaad93 Reset matrix-react-sdk back to develop branch 2021-01-26 12:29:29 +00:00
RiotRobot 86b0f898ec Reset matrix-js-sdk back to develop branch 2021-01-26 12:29:16 +00:00
RiotRobot e66d500b02 Merge branch 'master' into develop 2021-01-26 12:26:47 +00:00
RiotRobot cd8a9e44b3 Upgrade matrix-react-sdk to 3.12.1 2021-01-26 12:13:51 +00:00
RiotRobot 5052f9bc43 Upgrade matrix-js-sdk to 9.5.1 2021-01-26 12:12:41 +00:00
J. Ryan Stinnett 51361acb1a Fix Widget API version confusion 2021-01-19 15:14:04 +00:00
Travis Ralston 042ce153ae
Merge pull request #16177 from vector-im/travis/widget-api-update 
Update widget-api to beta 11
 2021-01-18 09:09:19 -07:00
RiotRobot c5217b6d6d Reset matrix-react-sdk back to develop branch 2021-01-18 15:25:13 +00:00
RiotRobot fff8ac231e Reset matrix-js-sdk back to develop branch 2021-01-18 15:25:01 +00:00
RiotRobot 238ed786fd Upgrade matrix-react-sdk to 3.12.0 2021-01-18 15:19:10 +00:00
RiotRobot 3275a0d819 Upgrade matrix-js-sdk to 9.5.0 2021-01-18 15:18:38 +00:00
Travis Ralston 8bdbb5c989 Update widget-api to beta 11 
Consistency with https://github.com/matrix-org/matrix-react-sdk/pull/5527
 2021-01-16 23:35:15 -07:00
RiotRobot 21cadb8a3b Upgrade matrix-react-sdk to 3.12.0-rc.1 2021-01-13 13:10:30 +00:00
RiotRobot 1fe8f27cf7 Upgrade matrix-js-sdk to 9.5.0-rc.1 2021-01-13 13:10:04 +00:00
J. Ryan Stinnett 852b7d0b89
Merge pull request #15999 from vector-im/jryans/prepublish-only 
Stop building code and types for Element layer
 2020-12-22 13:48:29 +00:00
RiotRobot 3dc3d4a8d4 Reset matrix-react-sdk back to develop branch 2020-12-21 17:50:47 +00:00
RiotRobot a7a70c2246 Reset matrix-js-sdk back to develop branch 2020-12-21 17:50:35 +00:00
RiotRobot 2861089193 Upgrade JS SDK to 9.4.1 and React SDK to 3.11.1 2020-12-21 17:43:11 +00:00
RiotRobot 554a9de7c7 Upgrade matrix-react-sdk to 3.11.0 2020-12-21 17:13:43 +00:00
RiotRobot 5a5b820fe5 Upgrade matrix-js-sdk to 9.4.0 2020-12-21 17:11:53 +00:00
J. Ryan Stinnett 799a14ebc6 Stop compiling code and types 
This layer is no longer published to NPM, so there is no longer any need to
prepare compiled code and types.
 2020-12-18 15:29:06 +00:00
RiotRobot 567a4a6a1c Upgrade JS SDK to 9.4.0-rc.2 and React SDK to 3.11.0-rc.2 2020-12-16 16:36:40 +00:00
dependabot[bot] 2918ee3e1b
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:48 +00:00
RiotRobot 79303ec387 Merge remote-tracking branch 'origin/develop' into develop 2020-12-07 13:05:47 +00:00
RiotRobot 3360f02ed9 Reset matrix-react-sdk back to develop branch 2020-12-07 13:01:39 +00:00
RiotRobot c4fa2d2585 Reset matrix-js-sdk back to develop branch 2020-12-07 13:01:29 +00:00
RiotRobot 110f4dc907 Upgrade matrix-react-sdk to 3.10.0 2020-12-07 12:36:01 +00:00
RiotRobot dab75ec0c2 Upgrade matrix-js-sdk to 9.3.0 2020-12-07 12:34:41 +00:00
dependabot[bot] aed9721936
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:36:22 +00:00
RiotRobot b4167eaeaf Upgrade matrix-react-sdk to 3.10.0-rc.1 2020-12-02 14:41:28 +00:00
RiotRobot 512212b021 Upgrade matrix-js-sdk to 9.3.0-rc.1 2020-12-02 14:41:03 +00:00
J. Ryan Stinnett d8e0ea5791 Include KaTeX CSS as a dependency 
This changes the KaTeX CSS inclusion to function just like the other bits of the
CSS that we import from dependencies.
 2020-11-27 12:18:24 +00:00
dependabot[bot] deb40fe172
Bump highlight.js from 9.18.1 to 10.1.2 
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 9.18.1 to 10.1.2.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/10.1.2/CHANGES.md)
- [Commits](https://github.com/highlightjs/highlight.js/compare/9.18.1...10.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-24 23:45:32 +00:00
Travis Ralston 278c81fbc6 Update the react-sdk reference in the lockfile 2020-11-24 10:48:46 -07:00
Travis Ralston 8c916721d2 Update widget API for good measure in Element Web 2020-11-24 09:46:32 -07:00
RiotRobot 9e2648877a Reset matrix-react-sdk back to develop branch 2020-11-23 16:52:23 +00:00
RiotRobot 19cc55f95d Reset matrix-js-sdk back to develop branch 2020-11-23 16:52:12 +00:00
RiotRobot c1d3b46259 Upgrade matrix-react-sdk to 3.9.0 2020-11-23 16:46:04 +00:00
RiotRobot 06355213ad Upgrade matrix-js-sdk to 9.2.0 2020-11-23 16:45:23 +00:00
RiotRobot 09bfe1a7e6 Upgrade matrix-react-sdk to 3.9.0-rc.1 2020-11-18 16:31:54 +00:00
RiotRobot 2b45efbdda Upgrade matrix-js-sdk to 9.2.0-rc.1 2020-11-18 16:30:48 +00:00
Travis Ralston f2b51848b7 Update the widget-api for element-web 
To prevent accidental package conflicts
 2020-11-12 12:07:51 -07:00
RiotRobot ca312254d5 Reset matrix-react-sdk back to develop branch 2020-11-09 16:42:55 +00:00
RiotRobot 83b9adadd7 Reset matrix-js-sdk back to develop branch 2020-11-09 16:42:45 +00:00
RiotRobot cefe77befc Upgrade matrix-react-sdk to 3.8.0 2020-11-09 16:36:47 +00:00
RiotRobot fcb6444771 Upgrade matrix-js-sdk to 9.1.0 2020-11-09 16:36:00 +00:00
RiotRobot f759c9b0a0 Upgrade matrix-react-sdk to 3.8.0-rc.1 2020-11-04 14:19:39 +00:00
RiotRobot 156752a220 Upgrade matrix-js-sdk to 9.1.0-rc.1 2020-11-04 14:18:34 +00:00
RiotRobot 35327ff6a4 Reset matrix-react-sdk back to develop branch 2020-10-28 15:24:23 +00:00
RiotRobot a3fdb1c2a2 Reset matrix-js-sdk back to develop branch 2020-10-28 15:24:11 +00:00
RiotRobot f821b7c8bb Upgrade matrix-react-sdk to 3.7.1 2020-10-28 15:13:55 +00:00
RiotRobot 469df236d9 Upgrade matrix-js-sdk to 9.0.1 2020-10-28 15:13:31 +00:00
RiotRobot 059366f07a Upgrade matrix-react-sdk to 3.7.0 2020-10-26 17:00:07 +00:00
RiotRobot 40384ffe42 Upgrade matrix-js-sdk to 9.0.0 2020-10-26 16:58:20 +00:00
RiotRobot 9856978d0a Upgrade matrix-react-sdk to 3.7.0-rc.2 2020-10-21 15:25:48 +01:00
RiotRobot d005d1f1c6 Upgrade matrix-react-sdk to 3.7.0-rc.1 2020-10-21 14:48:47 +01:00
RiotRobot 6f6c6d7b75 Upgrade matrix-js-sdk to 9.0.0-rc.1 2020-10-21 14:47:40 +01:00
RiotRobot a4e28cce88 Reset matrix-react-sdk back to develop branch 2020-10-20 11:46:35 +01:00
RiotRobot 68c4d005f1 Reset matrix-js-sdk back to develop branch 2020-10-20 11:46:24 +01:00
RiotRobot 2716629642 Upgrade matrix-react-sdk to 3.6.1 2020-10-20 11:38:05 +01:00
J. Ryan Stinnett 55153ba7d2 Shake lock file 2020-10-19 17:46:36 +01:00
J. Ryan Stinnett 2d97ff4eba Upgrade widget API 2020-10-19 17:46:35 +01:00
J. Ryan Stinnett 06aa5a9aa9 Shake lock file 2020-10-19 17:08:07 +01:00
J. Ryan Stinnett 0f76c858ac Upgrade widget API 2020-10-19 16:57:18 +01:00
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
RiotRobot f8dad68958 Add flux types as a dev dependency 
This is not the right thing to do, since we don't directly use Flux at this
layer, but for the moment we need it to get distribution builds working.
 2020-06-02 15:53:11 +01:00
RiotRobot e37680b6c1 Upgrade matrix-react-sdk to 2.7.0-rc.2 2020-06-02 14:41:44 +01:00
RiotRobot 94fee233a8 Upgrade matrix-js-sdk to 6.2.0-rc.1 2020-06-02 14:40:00 +01:00
Travis Ralston b9794ea6e4 Remove webpack-build-notifier from lockfile 2020-05-26 13:50:31 -06:00
Jorik Schellekens 43c0148123 Fix @types/react conflict in matrix-react-sdk 2020-05-25 18:37:30 +01:00
RiotRobot ef60265bb6 Reset matrix-react-sdk back to develop branch 2020-05-22 14:36:23 +01:00
RiotRobot aed4568882 Reset matrix-js-sdk back to develop branch 2020-05-22 14:36:11 +01:00
RiotRobot 16ecc007d6 Reset matrix-react-sdk back to develop branch 2020-05-19 11:36:17 +01:00
RiotRobot 92b94af9ed Reset matrix-js-sdk back to develop branch 2020-05-19 11:36:07 +01:00
RiotRobot ef0076bd83 Merge branch 'master' into develop 2020-05-19 11:34:45 +01:00
RiotRobot a9fbc190bf Upgrade matrix-react-sdk to 2.6.0 2020-05-19 11:28:08 +01:00
RiotRobot f35ec09b54 Upgrade matrix-js-sdk to 6.1.0 2020-05-19 11:27:41 +01:00
RiotRobot fe32590e30 Upgrade matrix-react-sdk to 2.6.0-rc.1 2020-05-14 16:35:02 +01:00
RiotRobot 710dc18f2c Upgrade matrix-js-sdk to 6.1.0-rc.1 2020-05-14 16:33:28 +01:00
Michael Telatynski 911bd2e469 Replace favico.js dependency with simplified variant grown from it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-13 05:19:08 +01:00
Michael Telatynski f4e21c3fc7 Remove electron_app as we now have riot-desktop repo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-06 11:32:13 +01:00
RiotRobot fb33b6082d Reset matrix-react-sdk back to develop branch 2020-05-05 11:41:33 +01:00
RiotRobot 99af02eecd Reset matrix-js-sdk back to develop branch 2020-05-05 11:41:11 +01:00
RiotRobot d5d4b95fee Merge branch 'master' into develop 2020-05-05 11:39:12 +01:00
RiotRobot 3e13de3069 Upgrade matrix-react-sdk to 2.5.0 2020-05-05 11:31:28 +01:00
RiotRobot cc192ab882 Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:30:41 +01:00
RiotRobot 1edfde3932 Upgrade matrix-react-sdk to 2.5.0-rc.6 2020-05-01 16:33:00 +01:00
RiotRobot 43879c410c Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:32:34 +01:00
RiotRobot 3c7de2c08f Upgrade matrix-react-sdk to 2.5.0-rc.5 2020-04-30 11:34:11 +01:00
RiotRobot ecc73905c1 Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:33:23 +01:00
RiotRobot e7cb2e4022 Upgrade matrix-react-sdk to 2.5.0-rc.4 2020-04-23 15:58:10 +01:00
RiotRobot 7600571cf5 Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:57:32 +01:00
Travis Ralston 3eadf35819 Manually undo emojibase changes in lockfile 2020-04-20 09:49:09 -06:00