Commit graph

3390 commits

Author SHA1 Message Date
Michael Telatynski
28d929f901 correct electron config to not point at personal piwik
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:10:13 +01:00
Michael Telatynski
6969baa5a6 change event wording
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:08:09 +01:00
Michael Telatynski
c2c417b207 add piwik config to riot.im electron build config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:07:56 +01:00
Michael Telatynski
2e75640cdd sample piwik config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 11:27:33 +01:00
Michael Telatynski
21b88ecfd5 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/piwik 2017-05-27 20:59:26 +01:00
Michael Telatynski
195fcba696 correct DNT check
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 20:56:25 +01:00
Michael Telatynski
61a67c52c5 initial piwik stuff
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 20:39:52 +01:00
Matthew Hodgson
4a3480b935 fix broken vars in i18n 2017-05-27 20:17:19 +01:00
Matthew Hodgson
85e6cbe0c7 oops, fix var names 2017-05-27 19:28:54 +01:00
Matthew Hodgson
4293273e55 fix a bunch of i18n fails picked up by check-i18n.pl 2017-05-27 19:26:19 +01:00
Matthew Hodgson
29653e88f7 Merge pull request #4053 from ollieh/issues/3927
Fixed an input field's background color in dark theme
2017-05-27 17:21:31 +01:00
Oliver Hunt
a526bd95aa Fixed an input field's background color in dark theme 2017-05-27 15:15:45 +01:00
Matthew Hodgson
ded2f95003 Merge pull request #4051 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-05-27 12:32:18 +01:00
RiotTranslate
94dd41f34e Merge remote-tracking branch 'origin/develop' into develop 2017-05-27 11:30:15 +00:00
nouts
b33eab0188 Translated using Weblate (French)
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/fr/
2017-05-27 11:30:14 +00:00
Tulir Asokan
4ff09199d7 Translated using Weblate (Finnish)
Currently translated at 0.8% (1 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/fi/
2017-05-27 11:30:14 +00:00
Matthew Hodgson
59a6879db9 Merge pull request #4049 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-05-27 11:21:54 +01:00
Tulir Asokan
a60ab42ee3 Added translation using Weblate (Finnish) 2017-05-27 07:33:17 +00:00
Matthew Hodgson
1a3c09dc1b Merge pull request #4048 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-05-27 01:08:21 +01:00
RiotTranslate
012cdf590a Merge remote-tracking branch 'origin/develop' into develop 2017-05-26 23:21:48 +00:00
Max Sandholm
ac42fbbd49 Translated using Weblate (Swedish)
Currently translated at 31.6% (38 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
2017-05-26 23:21:48 +00:00
dambador
0074fa00ac Translated using Weblate (Russian)
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
2017-05-26 23:21:48 +00:00
Szimszon
8e250531ce Translated using Weblate (Hungarian)
Currently translated at 11.6% (14 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
2017-05-26 23:21:48 +00:00
Matthew Hodgson
1ff6d4846c css for alwaysShowTimestamps 2017-05-27 00:13:59 +01:00
Matthew Hodgson
a12cfdb53c Merge pull request #4040 from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-05-26 23:00:35 +01:00
David Baker
d0395b939a Add babel eslint plugin
As our linter has been failing because it needs it
2017-05-26 22:59:40 +01:00
David Baker
22e5e2126b rev-parse the commit from the deps
Because it's not added to package.json by npm anymore
2017-05-26 22:52:49 +01:00
Matthew Hodgson
35a671d43c more i18n instructions 2017-05-26 22:45:14 +01:00
David Baker
96393f69b6 Remove old versions before linking react/js sdk 2017-05-26 22:37:44 +01:00
Max Sandholm
34af9f9b4b Added translation using Weblate (Swedish) 2017-05-26 21:20:16 +00:00
Szimszon
411a8be61d Added translation using Weblate (Hungarian) 2017-05-26 20:17:47 +00:00
Stanislav N
930e8af48b Translated using Weblate (Russian)
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
2017-05-26 20:11:47 +00:00
Stanislav N
3a7888e8a8 Translated using Weblate (Russian)
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
2017-05-26 20:07:45 +00:00
RiotTranslate
84fdcf1fff Merge remote-tracking branch 'origin/develop' into develop 2017-05-26 20:00:29 +00:00
dambador
de07654f2d Translated using Weblate (Russian)
Currently translated at 90.8% (109 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
2017-05-26 20:00:27 +00:00
Matthew Hodgson
3815872cf7 Merge pull request #4041 from turt2live/patch-1
Update translating.md: Minor suggestions
2017-05-26 20:12:56 +01:00
Travis Ralston
8ddf4ced64 Update translating.md: Minor suggestions
Primarily spelling, wording, and grammar. A little bit of formatting too.
2017-05-26 13:09:40 -06:00
RiotTranslate
cd9d3ea248 Merge branch 'develop' of git://github.com/vector-im/riot-web into develop 2017-05-26 18:52:19 +00:00
Matthew Hodgson
963c90c833 switch to develop deps... 2017-05-26 19:51:04 +01:00
Krombel
d626542baf Translated using Weblate (German)
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-05-26 18:47:45 +00:00
RiotTranslate
10d2caf5d6 Merge remote-tracking branch 'origin/develop' into develop 2017-05-26 18:43:09 +00:00
Krombel
2819799843 Translated using Weblate (German)
Currently translated at 97.5% (117 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-05-26 18:43:08 +00:00
Matthew Hodgson
09adfbd6d6 remove stale i18n instructions 2017-05-26 19:39:05 +01:00
Matthew Hodgson
1bcdf31afc Merge pull request #3993 from vector-im/t3chguy/tidy_electron_files
tidy electron files, they weren't pwetty
2017-05-26 18:52:41 +01:00
Matthew Hodgson
ff5adeff2c Merge branch 'develop' into t3chguy/tidy_electron_files 2017-05-26 18:50:48 +01:00
Matthew Hodgson
445a55c7ca Merge pull request #3992 from vector-im/t3chguy/electron_call_sleep
Prevent Power Save when in call (Electron)
2017-05-26 18:44:53 +01:00
David Baker
d313f4c7b6 Merge https://github.com/MTRNord/riot-web/pull/70/ 2017-05-26 18:44:08 +01:00
David Baker
5e0457c32d Merge pull request #4035 from vector-im/dbkr/translations
Translations!
2017-05-26 18:39:07 +01:00
Matthew Hodgson
9156a871f5 Merge pull request #3961 from Kieran-Gould/kieran-gould/12hourtimestamp
Kieran gould/12hourtimestamp
2017-05-26 18:23:11 +01:00
Matthew Hodgson
e26422ef10 fix a typo 2017-05-26 18:22:53 +01:00