Commit Graph

476 Commits (60295562918f0572a45f380edea6b41dfaa7880e)

Author SHA1 Message Date
Hubert Chathi 6029556291 Merge branch 'develop' into olm_3.2.2 2021-05-21 16:26:18 -04:00
Hubert Chathi 53eb0e0f26 Bump libolm dependency, and update package name. 2021-05-21 16:10:48 -04:00
Travis Ralston 51b380da65 Update matrix-widget-api/react-sdk dependency reference
To fix inevitable build errors.
2021-05-17 16:39:04 -06:00
RiotRobot c41ba297e3 Reset matrix-react-sdk back to develop branch 2021-05-17 14:00:39 +01:00
RiotRobot e565044aa3 Reset matrix-js-sdk back to develop branch 2021-05-17 14:00:27 +01:00
RiotRobot 0cd7d9a57d Upgrade matrix-react-sdk to 3.21.0 2021-05-17 13:52:21 +01:00
RiotRobot 8ce7de3b1c Upgrade matrix-js-sdk to 11.0.0 2021-05-17 13:51:42 +01:00
RiotRobot 4cb245b8d8 Upgrade matrix-react-sdk to 3.21.0-rc.1 2021-05-11 16:42:44 +01:00
RiotRobot 9502a11f6d Upgrade matrix-js-sdk to 11.0.0-rc.1 2021-05-11 16:41:56 +01:00
J. Ryan Stinnett 4acde37698 Merge remote-tracking branch 'origin/develop' into jryans/sanitize-upgrade 2021-05-11 09:51:35 +01:00
J. Ryan Stinnett dbd4e209d3 Switch back to release version of `sanitize-html`
The limit depth option has been available in a released version for a while now.
2021-05-10 17:48:06 +01:00
RiotRobot 10d5855bba Reset matrix-react-sdk back to develop branch 2021-05-10 15:33:40 +01:00
RiotRobot 182ec9cdb4 Reset matrix-js-sdk back to develop branch 2021-05-10 15:33:29 +01:00
RiotRobot c07f2e1c18 Merge branch 'master' into develop 2021-05-10 15:33:16 +01:00
RiotRobot 25f2859a95 Upgrade matrix-react-sdk to 3.20.0 2021-05-10 15:26:39 +01:00
RiotRobot 64c44aef8e Upgrade matrix-js-sdk to 10.1.0 2021-05-10 15:23:51 +01:00
J. Ryan Stinnett 8dfc3797f0
Merge pull request #17199 from vector-im/dependabot/npm_and_yarn/url-parse-1.5.1
Bump url-parse from 1.4.7 to 1.5.1
2021-05-10 13:31:36 +01:00
J. Ryan Stinnett bb979157e4
Merge pull request #17205 from vector-im/dependabot/npm_and_yarn/lodash-4.17.21
Bump lodash from 4.17.20 to 4.17.21
2021-05-10 13:21:02 +01:00
dependabot[bot] 114acc022f
Bump hosted-git-info from 2.8.8 to 2.8.9
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-10 01:45:11 +00:00
dependabot[bot] b1f9a96268
Bump lodash from 4.17.20 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-08 07:46:06 +00:00
dependabot[bot] 6670859dc6
Bump url-parse from 1.4.7 to 1.5.1
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.1.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 11:26:45 +00:00
dependabot[bot] 90825eac79
Bump ua-parser-js from 0.7.23 to 0.7.24
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.23 to 0.7.24.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.23...0.7.24)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 22:24:19 +00:00
RiotRobot bc70ef72ff Upgrade matrix-react-sdk to 3.20.0-rc.1 2021-05-04 15:58:02 +01:00
RiotRobot d3fb0acdfb Upgrade matrix-js-sdk to 10.1.0-rc.1 2021-05-04 15:56:59 +01:00
Germain 17dcef621e
Merge pull request #17052 from vector-im/gsouquet-desktop-i18n 2021-04-27 15:48:55 +01:00
Germain Souquet bf305f76a7 Upgrade matrix-web-i18n to use matrix prefixed binaries 2021-04-27 15:07:48 +01:00
RiotRobot 4b3ba43f38 Reset matrix-react-sdk back to develop branch 2021-04-26 18:05:19 +01:00
RiotRobot 7e6ce7fb76 Reset matrix-js-sdk back to develop branch 2021-04-26 18:04:54 +01:00
RiotRobot 5c126cb61e Merge branch 'master' into develop 2021-04-26 18:04:04 +01:00
RiotRobot 0c8fee3528 Upgrade matrix-react-sdk to 3.19.0 2021-04-26 17:52:34 +01:00
RiotRobot 535ca49479 Upgrade matrix-js-sdk to 10.0.0 2021-04-26 17:51:43 +01:00
Germain Souquet 86c61cab33 Move i18n utils to its own module 2021-04-26 16:52:11 +01:00
Germain Souquet 83359afe5d Remove deprecated velocity-animate dependency from lock file 2021-04-22 16:28:21 +01:00
Germain Souquet 417835fcca Preload Inter font to avoid FOIT on slow connections 2021-04-22 12:09:50 +01:00
Germain Souquet 708f6a26b1 Upgrade html-webpack-plugin to v4.5.2 2021-04-22 10:22:52 +01:00
RiotRobot 42067f9fd5 Upgrade matrix-react-sdk to 3.19.0-rc.1 2021-04-21 16:56:32 +01:00
RiotRobot ea8989816f Upgrade matrix-js-sdk to 10.0.0-rc.1 2021-04-21 16:55:51 +01:00
dependabot[bot] 0fa062ccf6
Bump ssri from 6.0.1 to 6.0.2
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-19 21:57:14 +00:00
Germain 1c18379b5c
Merge pull request #16963 from vector-im/gsouquet-deprecate-velocity
Remove velocity-animate from lockfile
2021-04-15 09:05:54 +01:00
Germain Souquet 325cf2c08b remove velocity animate from lockfile 2021-04-15 08:39:34 +01:00
RiotRobot fb0bc34042 Reset matrix-react-sdk back to develop branch 2021-04-12 15:33:08 +01:00
RiotRobot f38aedae85 Reset matrix-js-sdk back to develop branch 2021-04-12 15:32:56 +01:00
RiotRobot 19748762a5 Upgrade matrix-react-sdk to 3.18.0 2021-04-12 15:27:10 +01:00
RiotRobot d1d6ef55ff Upgrade matrix-js-sdk to 9.11.0 2021-04-12 15:26:37 +01:00
RiotRobot c7d34ae926 Upgrade matrix-react-sdk to 3.18.0-rc.1 2021-04-07 13:09:19 +01:00
RiotRobot 9400bd1fd2 Upgrade matrix-js-sdk to 9.11.0-rc.1 2021-04-07 13:07:02 +01:00
RiotRobot ff74d3ce13 Reset matrix-react-sdk back to develop branch 2021-03-29 13:45:49 +01:00
RiotRobot 75f840a214 Reset matrix-js-sdk back to develop branch 2021-03-29 13:45:37 +01:00
RiotRobot 929fa5d59d Upgrade matrix-react-sdk to 3.17.0 2021-03-29 13:38:52 +01:00
RiotRobot 20b1321818 Upgrade matrix-js-sdk to 9.10.0 2021-03-29 13:38:31 +01:00