Commit graph

6058 commits

Author SHA1 Message Date
Matthew Hodgson
845bb3fa09
Merge pull request #6588 from vector-im/dbkr/fix_media_2
Copy media from react-sdk
2018-04-23 18:12:34 +01:00
David Baker
0abaff5aed Copy media from react-sdk
Looks like this just got missed

Fixes https://github.com/vector-im/riot-web/issues/6586
2018-04-23 17:27:35 +01:00
David Baker
82f51fb476
Merge pull request #6580 from vector-im/dbkr/fix_favicon_2
Fix favicon
2018-04-23 11:50:38 +01:00
David Baker
f012dd5f31 Fix favicon
In removing 'media' here, it changed the meaning of the copy so
the contents of vector-icons (rather than the dir itself) got
copied to webapp/
2018-04-23 11:28:01 +01:00
David Baker
8d88e3be11 Run i18n and prune i18n
Any translations added to components now in react-sdk should be
merged over to react-sdk in 196b855cd5
2018-04-20 15:53:35 +01:00
David Baker
c98e977533
Merge pull request #6569 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2018-04-20 15:31:30 +01:00
Morten Juhl-Johansen Zölde-Fej
189e7e628b Translated using Weblate (Danish)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/da/
2018-04-20 14:18:28 +00:00
Weblate
1d43870433 Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
Conflicts:
	src/i18n/strings/da.json
	src/i18n/strings/eo.json
	src/i18n/strings/fr.json
	src/i18n/strings/hu.json
	src/i18n/strings/ja.json
	src/i18n/strings/nl.json
	src/i18n/strings/pl.json
	src/i18n/strings/sk.json
	src/i18n/strings/zh_Hans.json
2018-04-20 14:17:09 +00:00
adrian-007
33920d72f6 Translated using Weblate (Polish)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2018-04-20 14:04:19 +00:00
Megumin
4b8985f850 Translated using Weblate (Icelandic)
Currently translated at 56.1% (124 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/is/
2018-04-20 14:04:19 +00:00
Gergely Bakos
0be1d8e854 Translated using Weblate (Hungarian)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2018-04-20 14:04:19 +00:00
Kévin C
db3db2c49e Translated using Weblate (French)
Currently translated at 99.5% (220 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2018-04-20 14:04:19 +00:00
RainSlide
fb2f063f58 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2018-04-20 14:04:18 +00:00
Val
1853e55431 Translated using Weblate (French)
Currently translated at 98.6% (218 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2018-04-20 06:23:09 +00:00
Szimszon
d90cd33541 Translated using Weblate (Hungarian)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2018-04-18 19:35:24 +00:00
Peter Vágner
45b62e9866 Translated using Weblate (Slovak)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
2018-04-18 15:31:04 +00:00
toriko
6b509a1222 Translated using Weblate (Japanese)
Currently translated at 99.0% (219 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
2018-04-18 15:31:04 +00:00
RainSlide
316a1b835f Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
2018-04-18 15:31:03 +00:00
Matthew Hodgson
ddc20e2a60
Merge pull request #6500 from vector-im/matthew/fix_layering
move everything not explicitly riot (or status) branded into matrix-react-sdk
2018-04-18 16:30:57 +01:00
Matthew Hodgson
104a4150ae PR feedback; fix staticness and add ;s 2018-04-18 16:20:42 +01:00
Matthew Hodgson
e046a72750 flesh out status todo comment 2018-04-18 16:20:32 +01:00
Matthew Hodgson
df3fb83da3 move deps to sdk for stuff now in the sdk 2018-04-18 10:53:17 +01:00
Matthew Hodgson
7ee534388b convert VectorHomePage into ES6 and have it nicely override HomePage 2018-04-18 10:20:35 +01:00
lighthawk
c84d279d69 Translated using Weblate (Japanese)
Currently translated at 65.6% (145 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
2018-04-17 03:08:29 +00:00
toriko
21ee1828b3 Translated using Weblate (Japanese)
Currently translated at 63.3% (140 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
2018-04-17 01:39:58 +00:00
Sveinn í Felli
96ef7b4075 Translated using Weblate (Icelandic)
Currently translated at 52.4% (116 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/is/
2018-04-16 09:31:51 +00:00
Sveinn í Felli
f14e725d13 Translated using Weblate (Icelandic)
Currently translated at 50.6% (112 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/is/
2018-04-16 09:10:57 +00:00
Nathan van Beelen
f1ff09f303 Translated using Weblate (Dutch)
Currently translated at 100.0% (221 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2018-04-16 08:32:06 +00:00
Matthew Hodgson
c8b26a1002 fix tests 2018-04-16 00:23:34 +01:00
Matthew Hodgson
5c341154b7 fix theming during tests correctly 2018-04-16 00:19:08 +01:00
Matthew Hodgson
8684fae473 kill theming 404s when UTing 2018-04-16 00:14:09 +01:00
Matthew Hodgson
7c1eafd050 merge develop 2018-04-15 23:55:09 +01:00
Matthew Hodgson
0243ec0096 switch karma image loc 2018-04-15 23:52:52 +01:00
Matthew Hodgson
ce36dec767 run prune-i18n to bring translations inline now most are moved to react-sdk 2018-04-15 23:22:26 +01:00
Matthew Hodgson
b8d4866824 run gen-i18n to refresh translations now most are moved to react-sdk 2018-04-15 23:22:06 +01:00
Sveinn í Felli
c988f4d093 Translated using Weblate (Icelandic)
Currently translated at 29.8% (66 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/is/
2018-04-15 09:50:32 +00:00
Sveinn í Felli
62d48014c9 Added translation using Weblate (Icelandic) 2018-04-15 08:49:11 +00:00
lighthawk
d3cc6f594b Translated using Weblate (Japanese)
Currently translated at 35.7% (79 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
2018-04-15 05:36:14 +00:00
toriko
32dab7a1ba Translated using Weblate (Japanese)
Currently translated at 35.7% (79 of 221 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
2018-04-15 05:34:57 +00:00
Matthew Hodgson
a46b718b4a copy resources from their new locations 2018-04-13 01:49:52 +01:00
Matthew Hodgson
d6931252c1 move rageshake to sdk 2018-04-13 01:35:55 +01:00
Matthew Hodgson
aefb782892 move conference handler to matrix-react-sdk 2018-04-13 01:25:08 +01:00
Matthew Hodgson
3d20a64502 export enum via method for convenience from matrix-react-sdk 2018-04-13 01:25:00 +01:00
Matthew Hodgson
be34c84704 fix theme paths 2018-04-13 00:57:48 +01:00
Matthew Hodgson
534155fcd5 point to new CSS locations 2018-04-13 00:43:15 +01:00
Matthew Hodgson
f569fddf15 make VectorHomePage override HomePage 2018-04-13 00:42:58 +01:00
Matthew Hodgson
41d6995da4 fix braindead typo 2018-04-12 21:59:55 +01:00
Matthew Hodgson
8757c8cae0 move notif UTs to sdk 2018-04-12 20:24:44 +01:00
Matthew Hodgson
e899fece3c move themes to res to match sdk 2018-04-12 20:21:26 +01:00
Weblate
659e71e150 Merge remote-tracking branch 'origin/develop' into develop 2018-04-12 12:08:16 +00:00