Commit Graph

10606 Commits (01c84212f9aa9933a4fad56f31fd7e87a9958c0c)

Author SHA1 Message Date
J. Ryan Stinnett 4acde37698 Merge remote-tracking branch 'origin/develop' into jryans/sanitize-upgrade 2021-05-11 09:51:35 +01:00
Šimon Brandner 49bcf02db3
Merge remote-tracking branch 'upstream/develop' into https 2021-05-11 07:11:31 +02:00
Travis Ralston 45424f4a3b Better words? 2021-05-10 19:03:57 -06: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 93e6abefed v1.7.27 2021-05-10 15:29:37 +01:00
RiotRobot fc02ecc3a1 Prepare changelog for v1.7.27 2021-05-10 15:29:36 +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
J. Ryan Stinnett 1f2559a86d
Merge pull request #17219 from vector-im/dependabot/npm_and_yarn/hosted-git-info-2.8.9
Bump hosted-git-info from 2.8.8 to 2.8.9
2021-05-10 13:15:19 +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
Šimon Brandner 63f370c2db
Merge branch 'develop' into https 2021-05-09 08:43:04 +02: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
Travis Ralston c246d7839f Remove "in development" flag from voice messages labs documentation
See https://github.com/matrix-org/matrix-react-sdk/pull/5995
2021-05-07 19:37:40 -06:00
Travis Ralston cd127c51ae
Merge pull request #17194 from vector-im/travis/dev1
Disable host checking on the webpack dev server
2021-05-07 08:02:04 -06: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
Travis Ralston 6c8d52f8df Add jest config too 2021-05-06 22:14:33 -06:00
Travis Ralston b260621aff Disable host checking on the webpack dev server
This is useful when you're doing cross-browser testing on a service which demands you use "localhost.com" for reasons.
2021-05-06 21:51:43 -06:00
Travis Ralston 07a0af2aae Add required webpack config to load Safari support modules
See https://github.com/matrix-org/matrix-react-sdk/pull/5989
2021-05-06 21:51:03 -06:00
Travis Ralston 7cfec9255e
Merge pull request #17190 from vector-im/dependabot/npm_and_yarn/ua-parser-js-0.7.24
Bump ua-parser-js from 0.7.23 to 0.7.24
2021-05-06 19:12:50 -06: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
Quang Trung 12c56fb647 Translated using Weblate (Vietnamese)
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/vi/
2021-05-06 20:34:28 +00:00
Bartosz b39b92eb20 Translated using Weblate (Polish)
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/
2021-05-06 20:34:28 +00:00
Oliver Gramberg 008ea589dc Translated using Weblate (German)
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/de/
2021-05-06 20:34:28 +00:00
RiotRobot ee620be1ec v1.7.27-rc.1 2021-05-04 16:01:27 +01:00
RiotRobot 2db3bb5556 Prepare changelog for v1.7.27-rc.1 2021-05-04 16:01:26 +01: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
J. Ryan Stinnett 17c566e31e
Merge pull request #17160 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2021-05-04 15:28:33 +01:00
Weblate ac42f774aa Merge branch 'origin/develop' into Weblate. 2021-05-04 14:27:58 +00:00
liimee 28fb9bfc75 Translated using Weblate (Indonesian)
Currently translated at 23.5% (8 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/id/
2021-05-02 11:34:26 +00:00
iaiz b98effbf32 Translated using Weblate (Spanish)
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/es/
2021-05-02 11:34:26 +00:00
Hakim Oubouali 889ed4541b Translated using Weblate (Central Atlas Tamazight)
Currently translated at 41.1% (14 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/tzm/
2021-04-30 12:34:26 +00:00
@a2sc:matrix.org 427ca9d92d Translated using Weblate (German)
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/de/
2021-04-30 12:34:26 +00:00
Hakim Oubouali 3df2616f4e Translated using Weblate (Central Atlas Tamazight)
Currently translated at 41.1% (14 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/tzm/
2021-04-28 11:34:25 +00:00
jelv 9ef7507750 Translated using Weblate (Dutch)
Currently translated at 100.0% (34 of 34 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/
2021-04-28 11:34:25 +00:00
David Baker c5f533011b
Merge pull request #17008 from vector-im/dbkr/asserted_identity
Document option for obeying asserted identity
2021-04-28 09:47:50 +01:00
David Baker d03032b808 Put asserted identity under voip section 2021-04-27 19:34:21 +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
Michael Telatynski 5ad5af7f20
Merge pull request #17061 from vector-im/t3chguy/ts/1
Convert Vector skin react components to Typescript
2021-04-27 09:40:42 +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 6d056d7a08 v1.7.26 2021-04-26 17:55:54 +01:00
RiotRobot d22e1fff16 Prepare changelog for v1.7.26 2021-04-26 17:55:53 +01:00