Commit graph

9552 commits

Author SHA1 Message Date
J. Ryan Stinnett
add2458a45
Merge pull request #13504 from vector-im/jryans/rm-cross-signing-flags-config
Remove unused feature flag from config
2020-05-05 14:42:38 +01:00
J. Ryan Stinnett
bccfd9f93e Remove unused feature flag from config
The cross-signing feature flag was changed to a setting, so these values are
outdated and can be removed.

See also https://github.com/matrix-org/matrix-react-sdk/pull/4416
2020-05-05 13:24:09 +01:00
Weblate
c313bab431 Merge branch 'origin/develop' into Weblate. 2020-05-05 10:41:46 +00:00
RiotRobot
fb33b6082d Reset matrix-react-sdk back to develop branch 2020-05-05 11:41:33 +01:00
RiotRobot
99af02eecd Reset matrix-js-sdk back to develop branch 2020-05-05 11:41:11 +01:00
Weblate
baf498e611 Merge branch 'origin/develop' into Weblate. 2020-05-05 10:39:47 +00:00
oleg-fiksel
5926a0420c Translated using Weblate (Russian)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2020-05-05 10:39:47 +00:00
Christian Herzog
ccfc04d0e3 Translated using Weblate (German)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2020-05-05 10:39:47 +00:00
RiotRobot
d5d4b95fee Merge branch 'master' into develop 2020-05-05 11:39:12 +01:00
RiotRobot
beda6c3b25 v1.6.0 2020-05-05 11:35:22 +01:00
RiotRobot
8ff3a4453a Prepare changelog for v1.6.0 2020-05-05 11:35:22 +01:00
RiotRobot
ed6c69c040 v1.6.0 2020-05-05 11:31:35 +01:00
RiotRobot
3e13de3069 Upgrade matrix-react-sdk to 2.5.0 2020-05-05 11:31:28 +01:00
RiotRobot
cc192ab882 Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:30:41 +01:00
alexsal86
6ff5c98239 Translated using Weblate (German)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2020-05-04 13:18:14 +00:00
Christian Herzog
212662bc04 Translated using Weblate (German)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2020-05-04 13:18:14 +00:00
code-surfer
d888bcb313 Translated using Weblate (German)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2020-05-04 13:18:13 +00:00
Zoe
5dd452bec0 use a different image in previews 2020-05-04 11:42:09 +01:00
David Baker
0875795036
Merge pull request #13486 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2020-05-04 10:35:51 +01:00
Szimszon
a0707903b2 Translated using Weblate (Hungarian)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2020-05-04 09:08:17 +00:00
code-surfer
2fcedeb047 Translated using Weblate (German)
Currently translated at 86.1% (31 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2020-05-04 09:08:17 +00:00
random
6c6d6e07d3 Translated using Weblate (Italian)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2020-05-02 10:28:18 +00:00
Slavi Pantaleev
34bb6df00f Translated using Weblate (Bulgarian)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2020-05-02 10:28:18 +00:00
RiotRobot
be76d2ef3c v1.6.0-rc.6 2020-05-01 16:35:10 +01:00
RiotRobot
84c057e640 Prepare changelog for v1.6.0-rc.6 2020-05-01 16:35:10 +01:00
RiotRobot
3eb4026dc0 v1.6.0-rc.6 2020-05-01 16:33:04 +01:00
RiotRobot
1edfde3932 Upgrade matrix-react-sdk to 2.5.0-rc.6 2020-05-01 16:33:00 +01:00
RiotRobot
43879c410c Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:32:34 +01:00
Weblate
345f4e4c95 Merge branch 'origin/develop' into Weblate. 2020-05-01 08:37:58 +00:00
Mauro Torrez
2714a84630 Translated using Weblate (Spanish)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2020-05-01 08:37:58 +00:00
Kévin C
95599f4d6d Translated using Weblate (French)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2020-05-01 08:37:57 +00:00
Mauro Torrez
5ba6421b54 Translated using Weblate (French)
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2020-05-01 08:37:57 +00:00
Jeff Huang
3dca5f5af8 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (36 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
2020-05-01 08:37:57 +00:00
Mauro Torrez
0844f15aa0 Translated using Weblate (Catalan)
Currently translated at 52.8% (19 of 36 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
2020-05-01 08:37:57 +00:00
Zoe
0e75b1b0db
Merge pull request #13357 from vector-im/foldleft/decoder-ring
Developer tool: convert rageshake error locations back to sourcecode locations
2020-05-01 09:37:51 +01:00
Weblate
e23870d050 Merge branch 'origin/develop' into Weblate. 2020-04-30 16:48:49 +00:00
Michael Telatynski
33406d1709
Merge pull request #13329 from vector-im/t3chguy/app_load4
App load tweaks, improve error pages
2020-04-30 17:48:43 +01:00
Weblate
5568bb15c4 Merge branch 'origin/develop' into Weblate. 2020-04-30 16:20:44 +00:00
J. Ryan Stinnett
ba6e1d924f
Merge pull request #13465 from vector-im/jryans/update-default-device-format
Tweak default device name to be more compact
2020-04-30 17:20:39 +01:00
J. Ryan Stinnett
1ad54a4dae Tweak default device name to be more compact
Fixes https://github.com/vector-im/riot-web/issues/13458
2020-04-30 16:50:01 +01:00
Weblate
edb4f9bf05 Merge branch 'origin/develop' into Weblate. 2020-04-30 15:45:18 +00:00
yuuki-san
c3b0a24bdd Translated using Weblate (Slovak)
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
2020-04-30 15:45:18 +00:00
Slavi Pantaleev
fd5aea20ef Translated using Weblate (Bulgarian)
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
2020-04-30 15:45:18 +00:00
J. Ryan Stinnett
9fb5a6de3d
Merge pull request #13460 from vector-im/jryans/stylise-macos
Tweak default device name on macOS
2020-04-30 16:45:11 +01:00
J. Ryan Stinnett
ab40d5b732 Update copyright header 2020-04-30 16:02:37 +01:00
J. Ryan Stinnett
dec5ea1637 Tweak default device name on macOS
This tweak's the OS name in the default device name for macOS devices to match
Apple's current branding.

Fixes https://github.com/vector-im/riot-web/issues/13459
2020-04-30 15:58:53 +01:00
Zoe
4110e2dfa3 Move codebase into riot-web 2020-04-30 13:58:17 +01:00
RiotRobot
29df8a8a2e v1.6.0-rc.5 2020-04-30 11:37:43 +01:00
RiotRobot
429f36ebfc Prepare changelog for v1.6.0-rc.5 2020-04-30 11:37:42 +01:00
RiotRobot
5844cb9428 v1.6.0-rc.5 2020-04-30 11:34:37 +01:00