Commit graph

10282 commits

Author SHA1 Message Date
Travis Ralston
c41f164c75
Merge pull request #15912 from vector-im/travis/semicolon
Fix an important semicolon
2020-12-07 15:58:07 -07:00
Travis Ralston
d0b9b211c9 Fix an important semicolon 2020-12-07 14:46:56 -07:00
Weblate
ed255e48f9 Merge branch 'origin/develop' into Weblate. 2020-12-07 13:06:08 +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
c4545341ea Merge branch 'master' into develop 2020-12-07 13:00:45 +00:00
Weblate
ef839c45a7 Merge branch 'origin/develop' into Weblate. 2020-12-07 12:58:09 +00:00
Jeanne Lavoie
9a8f9307fe Translated using Weblate (French)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fr/
2020-12-07 12:58:09 +00:00
J. Ryan Stinnett
a991156608
Merge pull request #15898 from vector-im/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:01 +00:00
RiotRobot
1b481c2a13 v1.7.15 2020-12-07 12:54:59 +00:00
RiotRobot
44fefec9ea Prepare changelog for v1.7.15 2020-12-07 12:54:58 +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
Salamandar
c67906c3c6 Translated using Weblate (French)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fr/
2020-12-06 20:55:24 +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
J. Ryan Stinnett
344363d29d
Merge pull request #15894 from vector-im/jryans/add-gitter
Add gitter.im to room directory
2020-12-04 11:17:07 +00:00
J. Ryan Stinnett
aef2ffb01b Add gitter.im to room directory 2020-12-04 11:00:38 +00:00
Šimon Brandner
24cc106d90 Merge branch 'develop' into feature-multi-language-spell-check 2020-12-03 12:04:46 +01:00
Šimon Brandner
ccc3038793 Don't exclude default 2020-12-03 08:27:18 +01:00
Šimon Brandner
6844c8f92e Hide spell-check settings if not using Electron 2020-12-02 20:15:00 +01:00
Michael Telatynski
a63bd875bc
Merge pull request #15771 from vector-im/t3chguy/socials
Extend Platform to support idpId for SSO flows
2020-12-02 15:48:56 +00:00
RiotRobot
9084a70e2e v1.7.15-rc.1 2020-12-02 15:02:39 +00:00
RiotRobot
1c63db6441 Prepare changelog for v1.7.15-rc.1 2020-12-02 15:00:23 +00:00
J. Ryan Stinnett
1a635f6bf0 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-12-02 14:58:56 +00:00
J. Ryan Stinnett
ed05f9deae
Merge pull request #15843 from vector-im/jryans/tweak-katex-css
Include KaTeX CSS as a dependency
2020-12-02 14:52:01 +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
d3b3bb42aa
Merge pull request #15884 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2020-12-02 14:04:40 +00:00
Šimon Brandner
1c9d25986a Cleanup 2020-12-01 20:19:14 +01:00
Šimon Brandner
a8a422105b Added getAvailableSpellCheckLanguages() method 2020-11-29 20:52:19 +01:00
MamasLT
078a1223b2 Translated using Weblate (Lithuanian)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/lt/
2020-11-29 18:50:02 +00:00
Šimon Brandner
3419140bee Fix spelling 2020-11-28 19:38:39 +01:00
Šimon Brandner
13a5192995 Added a call to loadSpellCheckLanguages() method 2020-11-28 19:36:39 +01:00
Šimon Brandner
7ae86af7df Added loadSpellCheckLanguages() method 2020-11-28 19:36:18 +01: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
Weblate
11d54e926e Merge branch 'origin/develop' into Weblate. 2020-11-27 11:56:05 +00:00
J. Ryan Stinnett
301ea6a5f3
Merge pull request #15277 from akissinger/katex
added katex.min.css to webpack for math support (main PR in matrix-react-sdk)
2020-11-27 11:55:56 +00:00
Aleks Kissinger
e743a12f30 matched setting name to PR in matrix-react-sdk 2020-11-26 17:40:14 +00:00
Weblate
8f409a8277 Merge branch 'origin/develop' into Weblate. 2020-11-26 15:59:26 +00:00
J. Ryan Stinnett
bb370f143c
Merge pull request #15828 from vector-im/jryans/more-rebranding
Rebrand package name and other details
2020-11-26 15:59:18 +00:00
Weblate
2d1d5e5066 Merge branch 'origin/develop' into Weblate. 2020-11-26 14:22:27 +00:00
J. Ryan Stinnett
354898376b
Merge pull request #15819 from vector-im/dependabot/npm_and_yarn/highlight.js-10.1.2
Bump highlight.js from 9.18.1 to 10.1.2
2020-11-26 14:22:19 +00:00
Priit Jõerüüt
899bcc067f Translated using Weblate (Estonian)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/et/
2020-11-25 22:50:02 +00:00
Юрий Руренко
58445efdde Translated using Weblate (Ukrainian)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/uk/
2020-11-25 22:50:01 +00:00
m4sk1n
6e7826f416 Translated using Weblate (Polish)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/
2020-11-25 22:50:01 +00:00
J. Ryan Stinnett
f1e89bf833 Replace various instances of Riot with Element 2020-11-25 17:01:19 +00:00
J. Ryan Stinnett
d05c022d4f Rebrand some GitHub links 2020-11-25 14:16:55 +00:00
J. Ryan Stinnett
06611cb9cb Change package name now that publishing to NPM has stopped 2020-11-25 14:14:41 +00:00
J. Ryan Stinnett
64fd07ec73
Merge pull request #15810 from vector-im/jryans/rebrand-packaged-artifact
Update branding of packaging artifacts
2020-11-25 11:16:40 +00:00