Commit Graph

3452 Commits

Author SHA1 Message Date
Matthew Hodgson 485d080f85 Merge pull request from turt2live/travis/12h-ts-collision
Smaller font size on timestamp to better fit in the available space
2017-05-30 17:23:39 +01:00
turt2live 3f04a42229 Smaller font size on timestamp to better fit in the available space
Part of addressing 

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-30 09:32:27 -06:00
Richard van der Hoff 469bb8fbc6 Merge pull request from vector-im/rav/node_versions
Make travis run the build with several versions of node
2017-05-30 16:06:48 +01:00
Matthew Hodgson 60a56d0617 Merge pull request from vector-im/t3chguy/piwik
Piwik Analytics
2017-05-30 15:59:08 +01:00
Richard van der Hoff 33b95d4965 Standardise on node v6/v7 2017-05-30 15:53:21 +01:00
Matthew Hodgson e405d3f179 Merge pull request from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-05-30 15:09:18 +01:00
RiotTranslate d96c3656a6 Merge remote-tracking branch 'origin/develop' into develop 2017-05-30 14:01:24 +00:00
Matthew Hodgson 8e1dea7bd1 Merge pull request from vector-im/t3chguy/pl_redact_fix
managed to eat the eventStatus check, can't redact a local-echo etc
2017-05-30 14:21:41 +01:00
Michael Telatynski 6a57742343 managed to eat the eventStatus check, can't redact a local-echo etc
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 14:19:33 +01:00
RiotTranslate a61b7af17a Merge remote-tracking branch 'origin/develop' into develop 2017-05-30 13:14:29 +00:00
RiotTranslate e15d070e8f [WEBLATE] fix issues. 2017-05-30 13:11:04 +00:00
Bhuvan Krishna 83926eefce Added translation using Weblate (Telugu) 2017-05-30 12:22:01 +00:00
Luke Barnard 543f4efc37 Merge pull request from vector-im/t3chguy/show_redact_if_can
show redact in context menu only if has PL to/sent message
2017-05-30 10:13:20 +01:00
RiotTranslate b3426a1268 Update from Weblate. ()
* Added translation using Weblate (Ukrainian)

* 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-30 04:00:36 +01:00
Michael Telatynski 17c4e7a748 check PL on change as well as on comp load, that way it'll show remove button if PL increases later.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 23:49:56 +01:00
Michael Telatynski d3f9304598 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/show_redact_if_can 2017-05-29 23:17:44 +01:00
Michael Telatynski b9ec25b32f add flow annotation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 20:03:21 +01:00
Michael Telatynski e991461e8d add new BasePlatform method, Analytics fun on the Webpack train
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:51:28 +01:00
Michael Telatynski 8a59acb5c3 explicit protocol in configs, otherwise breaks in Electron
when it tries file://

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:32:44 +01:00
Michael Telatynski dda73cecf9 make eslint happy about MatrixToolbar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:12:04 +01:00
Matthew Hodgson 8ef7dda7bd fixing missing OK button on TextInputDialog 2017-05-29 16:43:28 +01:00
Bamstam 7674a43e7f 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-29 15:07:11 +00:00
Michael Telatynski 3e7b738b11 move all piwik init stuff to MatrixChat/Analytics
as it now relies on SDKConfig

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:22:57 +01:00
Michael Telatynski 3e7ef112f0 opt out based on analyticsOptOut localSetting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 13:17:12 +01:00
Strix Aluco 00cf1da758 Added translation using Weblate (Ukrainian) 2017-05-29 06:57:55 +00:00
Matthew Hodgson fabae2f19f Merge pull request from turt2live/travis/redact-to-remove
Change redact -> remove to improve clarity
2017-05-28 22:41:52 +01:00
Matthew Hodgson da7c6ca856 Merge branch 'develop' into travis/redact-to-remove 2017-05-28 22:41:38 +01:00
Matthew Hodgson 47d412df73 Merge pull request from RiotTranslate/weblate-riot-web-riot-web
Update from Weblate.
2017-05-28 21:46:38 +01:00
Matthew Hodgson ab9ecc4f64 remove duplicate i18n keys 2017-05-28 21:35:47 +01:00
Radium 3df6ecfe84 Added translation using Weblate (Chinese (Traditional)) 2017-05-28 16:11:35 +00:00
Chazy Chaz 0bdbdc2d1c Translated using Weblate (Spanish)
Currently translated at 95.0% (114 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/es/
2017-05-28 15:43:24 +00:00
Chazy Chaz 367585cf6f Translated using Weblate (Spanish)
Currently translated at 18.3% (22 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/es/
2017-05-28 13:35:30 +00:00
RiotTranslate 7b00be7f57 remove wrong generated file 2017-05-28 13:34:53 +00:00
Chazy Chaz efe3c239e1 Added translation using Weblate (Spanish) 2017-05-28 12:41:24 +00:00
Chazy Chaz 44e58d2eff Added translation using Weblate (_ES (generated)) 2017-05-28 12:40:43 +00:00
PureTryOut c238fe6605 Translated using Weblate (Dutch)
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/nl/
2017-05-28 12:33:35 +00:00
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
PureTryOut c02ee7a0dd Translated using Weblate (Dutch)
Currently translated at 5.0% (6 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/
2017-05-28 11:18:32 +00:00
PureTryOut 03f698ce8c Translated using Weblate (Dutch)
Currently translated at 4.1% (5 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/
2017-05-28 11:17:54 +00:00
RiotTranslate fb523fd613 [WEBLATE] fix merge issue 2017-05-28 11:17:13 +00:00
Thomas Juberg 46bca69321 Translated using Weblate (Norwegian Bokmål)
Currently translated at 9.1% (11 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nb_NO/
2017-05-28 11:04:08 +00:00
PureTryOut 6039e5a2be Added translation using Weblate (Dutch) 2017-05-28 11:04:06 +00:00
Michael Telatynski 2e75640cdd sample piwik config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 11:27:33 +01:00
Matthew Hodgson 0c140df789 Merge pull request from t3chguy/forward_message
Message Forwarding
2017-05-28 02:37:24 +01:00
Matthew Hodgson 2f71dc9fe5 Merge branch 'develop' into forward_message 2017-05-28 02:37:10 +01:00
RiotTranslate 73a811aa91 Update from Weblate. ()
* Added translation using Weblate (Norwegian Bokmål)

* 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/

* Translated using Weblate (Hungarian)

Currently translated at 55.0% (66 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
2017-05-27 23:28:44 +01:00
RiotTranslate bbdfe39745 Merge remote-tracking branch 'origin/develop' into develop 2017-05-27 22:13:01 +00:00
Szimszon 918aa01ee5 Translated using Weblate (Hungarian)
Currently translated at 55.0% (66 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/hu/
2017-05-27 22:13:00 +00:00