Commit Graph

10480 Commits

Author SHA1 Message Date
Michael Telatynski
262b856813
Merge pull request #15614 from vector-im/t3chguy/countly
Add countly experiment to develop/nightly configs
2020-10-30 13:09:13 +00:00
Michael Telatynski
a84925259f Add countly experiment to develop/nightly configs 2020-10-30 10:32:21 +00:00
Weblate
9c3325fb67 Merge branch 'origin/develop' into Weblate. 2020-10-29 03:18:34 +00:00
Travis Ralston
56761020bb
Merge pull request #15592 from vector-im/travis/ui-feat/history
Add documentation for new UIFeature flag regarding room history settings
2020-10-28 21:18:25 -06:00
Weblate
6b31c14c97 Merge branch 'origin/develop' into Weblate. 2020-10-28 15:27:07 +00:00
RiotRobot
67d82f2695 Merge remote-tracking branch 'origin/develop' into develop 2020-10-28 15:26:41 +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
Weblate
98acd1b059 Merge branch 'origin/develop' into Weblate. 2020-10-28 15:23:45 +00:00
J. Ryan Stinnett
4bff37b16c
Merge pull request #15590 from vector-im/jryans/rename-docker-repo
Rename Docker repo in docs
2020-10-28 15:23:38 +00:00
RiotRobot
098d8b154b Merge branch 'master' into develop 2020-10-28 15:22:24 +00:00
RiotRobot
cc7e64375d v1.7.12 2020-10-28 15:18:19 +00:00
RiotRobot
9d6bbef04e Prepare changelog for v1.7.12 2020-10-28 15:18:19 +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
J. Ryan Stinnett
d64639c70a Rename Docker repo in docs
We now have a Docker repo named `element-web`, so this updates docs to match.

Fixes https://github.com/vector-im/element-web/issues/14930
2020-10-28 14:32:25 +00:00
Travis Ralston
71206e8e3d Add documentation for new UIFeature flag regarding room history settings 2020-10-27 19:23:06 -06:00
Michael Telatynski
ce44cbb2dc
Merge pull request #15577 from vector-im/t3chguy/fix/jitsi-cherry-pick
[Release] Fix Jitsi regressions with custom themes
2020-10-27 12:05:09 +00:00
Michael Telatynski
be1e4552aa fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through 2020-10-27 11:48:03 +00:00
Michael Telatynski
d297ee5c7e Fix theme variable handling with invalid values 2020-10-27 11:48:03 +00:00
Weblate
b9a7531926 Merge branch 'origin/develop' into Weblate. 2020-10-27 11:38:34 +00:00
DO4TQe1jcGNLk9GvtDKqismfsIht20JBP7bps1OzQnvTDSwYSN
5de910a9eb Translated using Weblate (Dutch)
Currently translated at 87.8% (29 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/
2020-10-27 11:38:34 +00:00
Michael Telatynski
dda3779ad8
Merge pull request #15575 from vector-im/t3chguy/fix/jitsi
Fix Jitsi regressions with custom themes
2020-10-27 11:38:26 +00:00
Michael Telatynski
0bdf979c46 fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through 2020-10-27 11:26:41 +00:00
Michael Telatynski
7c895bd8c0 Fix theme variable handling with invalid values 2020-10-27 11:26:41 +00:00
Weblate
fe98a8b0c2 Merge branch 'origin/develop' into Weblate. 2020-10-26 17:22:32 +00:00
RiotRobot
90d5c202c6 Reset matrix-react-sdk back to develop branch 2020-10-26 17:22:22 +00:00
RiotRobot
d8a7af0e7e Reset matrix-js-sdk back to develop branch 2020-10-26 17:22:11 +00:00
Weblate
7fe1acfd91 Merge branch 'origin/develop' into Weblate. 2020-10-26 17:22:09 +00:00
John
e9b7b36c87 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/
2020-10-26 17:22:09 +00:00
RiotRobot
6cef14e6cc v1.7.11 2020-10-26 17:19:01 +00:00
RiotRobot
212e4f831f Prepare changelog for v1.7.11 2020-10-26 17:19:00 +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
MamasLT
5a9cc764c6 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-10-23 19:49:50 +00:00
RiotRobot
13330c5b8c v1.7.11-rc.1 2020-10-21 15:30:41 +01:00
RiotRobot
beb98e9ebb Prepare changelog for v1.7.11-rc.1 2020-10-21 15:30:40 +01: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
J. Ryan Stinnett
dae2f6c442
Merge pull request #15516 from vector-im/jryans/translate-rename
Update Weblate URL
2020-10-21 13:38:38 +01:00
J. Ryan Stinnett
33c93e55c6
Merge pull request #15517 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2020-10-21 13:37:46 +01:00
J. Ryan Stinnett
4d2e4d30ca Update translation project names 2020-10-21 13:23:38 +01:00
J. Ryan Stinnett
6420120dd4 Update Weblate URL 2020-10-21 13:16:43 +01:00
Weblate
c5ba9de9c7 Merge branch 'origin/develop' into Weblate. 2020-10-21 11:41:44 +00:00
Michael Telatynski
e391eea779
Merge pull request #15499 from vector-im/t3chguy/feat/widgets
Jitsi accept theme variable and restyle
2020-10-21 12:41:36 +01:00
Weblate
66a20f5356 Merge branch 'origin/develop' into Weblate. 2020-10-20 14:11:27 +00:00
J. Ryan Stinnett
36bd39fd21
Merge pull request #15506 from vector-im/jryans/release-disable-editor
Skip editor confirmation of upgrades
2020-10-20 15:11:20 +01:00
J. Ryan Stinnett
78dd07cbfd Skip editor confirmation of upgrades
In practice, the upgrades are always fine, and this editor prompt just adds
delays.
2020-10-20 11:57:02 +01:00
Weblate
ab5c00e8c4 Merge branch 'origin/develop' into Weblate. 2020-10-20 10:47:21 +00:00