Commit graph

10309 commits

Author SHA1 Message Date
J. Ryan Stinnett
993c2e50b5 Fix Electron type merging
This changes to an interface for Electron types so that other layers can merge
in further APIs as needed, such as the JS SDK.
2021-02-08 15:12:31 +00:00
Weblate
11cc33c8d2 Merge branch 'origin/develop' into Weblate. 2021-02-08 15:10:17 +00:00
J. Ryan Stinnett
9f4d75f2ed
Merge pull request #16381 from vector-im/richvdh-readme-patch-1
README: remove Jenkins reference
2021-02-08 15:10:10 +00:00
Andrejs
52f469d7c9 Translated using Weblate (Latvian)
Currently translated at 84.8% (28 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/lv/
2021-02-07 23:33:30 +00:00
iaiz
29639bb0e6 Translated using Weblate (Spanish)
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/es/
2021-02-07 23:33:30 +00:00
Richard van der Hoff
0d4958319b
README: remove Jenkins reference 2021-02-05 16:16:48 +00:00
Weblate
dfd17fedfe Merge branch 'origin/develop' into Weblate. 2021-02-04 15:28:09 +00:00
Yamamoto Kenji
cfadc616b2 Translated using Weblate (Japanese)
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/ja/
2021-02-04 15:28:09 +00:00
Michael Telatynski
816ea3d904
Merge pull request #16307 from vector-im/t3chguy/spaces
Enable PostCSS Calc in webpack builds
2021-02-04 15:28:01 +00:00
Weblate
cefe8cf379 Merge branch 'origin/develop' into Weblate. 2021-02-04 12:45:06 +00:00
J. Ryan Stinnett
4acdb7c715
Merge pull request #16367 from vector-im/add-readme-security-best-practices
Add configuration security best practices to the README.
2021-02-04 12:44:59 +00:00
Weblate
105d1c8c41 Merge branch 'origin/develop' into Weblate. 2021-02-04 12:39:46 +00:00
Rintan
4f852f3d69 Translated using Weblate (Japanese)
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/ja/
2021-02-04 12:39:45 +00:00
RiotRobot
1b276c9e00 Reset matrix-react-sdk back to develop branch 2021-02-04 12:27:31 +00:00
RiotRobot
fb67a14486 Reset matrix-js-sdk back to develop branch 2021-02-04 12:25:41 +00:00
RiotRobot
ab828ac6d9 Merge branch 'master' into develop 2021-02-04 12:24:38 +00:00
Denis Kasak
b22484d203 Add configuration security best practices to the README.
Closes #13870.
2021-02-04 13:24:19 +01:00
RiotRobot
ff9df5dd1f v1.7.20 2021-02-04 12:19:46 +00:00
RiotRobot
5523d7e0f5 Prepare changelog for v1.7.20 2021-02-04 12:12:00 +00:00
RiotRobot
f2bb636373 Upgrade matrix-react-sdk to 3.13.1 2021-02-04 12:09:36 +00:00
Weblate
b617cb78e7 Merge branch 'origin/develop' into Weblate. 2021-02-03 12:30:05 +00:00
RiotRobot
c6e94c61db Reset matrix-react-sdk back to develop branch 2021-02-03 12:29:53 +00:00
RiotRobot
9a32dd7071 Reset matrix-js-sdk back to develop branch 2021-02-03 12:29:42 +00:00
RiotRobot
8d604ced78 Merge branch 'master' into develop 2021-02-03 12:28:56 +00:00
RiotRobot
56caad3ef2 v1.7.19 2021-02-03 12:24:51 +00:00
RiotRobot
0bce2de538 Prepare changelog for v1.7.19 2021-02-03 12:24:50 +00:00
RiotRobot
7c8ecaaca3 Upgrade matrix-react-sdk to 3.13.0 2021-02-03 12:21:31 +00:00
RiotRobot
db0897f78e Upgrade matrix-js-sdk to 9.6.0 2021-02-03 12:16:48 +00:00
J. Ryan Stinnett
a34361fcd7
Merge pull request #16348 from vector-im/jryans/tally-ho-release
[Release] Upgrade matrix-widget-api
2021-02-02 15:28:14 +00:00
J. Ryan Stinnett
d2c161b451 Upgrade matrix-widget-api 2021-02-02 15:22:24 +00:00
Weblate
93f1cb6ecb Merge branch 'origin/develop' into Weblate. 2021-02-02 15:14:11 +00:00
Slobodan Simić
1f71eb1b33 Translated using Weblate (Serbian)
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/sr/
2021-02-02 15:14:11 +00:00
Tim Al
92d63579af Translated using Weblate (Dutch)
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/nl/
2021-02-02 15:14:11 +00:00
John
59f82eaf0a Translated using Weblate (Greek)
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/el/
2021-02-02 15:14:11 +00:00
@a2sc:matrix.org
50adc958c3 Translated using Weblate (German)
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/de/
2021-02-02 15:14:11 +00:00
J. Ryan Stinnett
173ca66f29
Merge pull request #16347 from vector-im/jryans/tally-ho
Upgrade matrix-widget-api
2021-02-02 15:14:04 +00:00
J. Ryan Stinnett
ade9babb80 Upgrade matrix-widget-api 2021-02-02 15:04:27 +00:00
Auri B. P
d4627576c8 Translated using Weblate (Catalan)
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/ca/
2021-01-31 17:35:50 +00:00
Ricardo
49d3d5dffe Translated using Weblate (Spanish)
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/es/
2021-01-31 17:35:50 +00:00
RiotRobot
341c806ac1 v1.7.19-rc.1 2021-01-29 17:34:02 +00:00
RiotRobot
2f9395e4a4 Prepare changelog for v1.7.19-rc.1 2021-01-29 17:34:02 +00:00
RiotRobot
4b25054d92 Upgrade matrix-react-sdk to 3.13.0-rc.1 2021-01-29 17:30:39 +00:00
RiotRobot
e010e27f9d Upgrade matrix-js-sdk to 9.6.0-rc.1 2021-01-29 17:30:19 +00:00
J. Ryan Stinnett
e31051e5ea
Merge pull request #16314 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2021-01-29 17:13:42 +00:00
Weblate
3d47540846 Merge branch 'origin/develop' into Weblate. 2021-01-29 13:29:10 +00:00
Michael Telatynski
d5a824d6dd
Merge pull request #16292 from vector-im/t3chguy/sso_fixes
Use history replaceState instead of redirect for SSO flow
2021-01-29 13:29:02 +00:00
Weblate
75f6c017c1 Merge branch 'origin/develop' into Weblate. 2021-01-29 11:18:20 +00:00
J. Ryan Stinnett
8f0537f9a3
Merge pull request #16301 from vector-im/jryans/maybe-mobile
Document the mobile guide toast option
2021-01-29 11:18:14 +00:00
Weblate
024549cef4 Merge branch 'origin/develop' into Weblate. 2021-01-29 11:02:33 +00:00
J. Ryan Stinnett
5af530c24e Lock new version of React SDK for widget API 2021-01-29 11:02:19 +00:00