gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,808 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

3808 Commits

Author SHA1 Message Date
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 9c25aab509 Fix bad merge (3993 before 4021 broke things) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 22:12:36 +01:00
Michael Telatynski 1d2bd68200 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_settings 2017-05-29 22:12:06 +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 1af86405bd Merge branch 'new-guest-access' into tom-welcome-page 2017-05-29 18:38:57 +01:00
Matthew Hodgson 823fbafe85 WIP improvements on welcome page; fix indentation, some verbiage and some CSS 2017-05-29 18:37:35 +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
Tom Lant 3ea3630c3b static images for the various rooms (there's no initial for the plain-background rooms yet, though this would likely be more flexible to do in css) 2017-05-29 11:36:05 +01:00
Tom Lant 8083f2d934 fixing up the link to the translation room 2017-05-29 11:35:13 +01:00
Strix Aluco 00cf1da758 Added translation using Weblate (Ukrainian) 2017-05-29 06:57:55 +00:00
Matthew Hodgson f085d2db39 make flags less muddy - fixes https://github.com/vector-im/riot-web/issues/3974 2017-05-29 00:10:08 +01:00
Matthew Hodgson a92d96347b Merge branch 'develop' into new-guest-access 2017-05-28 22:50:53 +01:00
Matthew Hodgson fabae2f19f Merge pull request #3722 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 #4058 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 #3688 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. (#4057) 
* 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
Bamstam c83188be51 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-27 22:13:00 +00:00
Thomas Juberg 664b5c29c3 Added translation using Weblate (Norwegian Bokmål) 2017-05-27 22:12:59 +00: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