7a744e751d
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 17:16:49 +00:00
84661ee544
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 17:16:48 +00:00
f4c7aaf138
Merge pull request #4084 from vector-im/kegan/translation-monkey
...
Translate src/components/structures
2017-05-30 18:13:36 +01:00
cd4efc903d
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 17:10:19 +00:00
88edd1620c
Update from Weblate. ( #4083 )
...
* 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 (German)
Currently translated at 99.1% (119 of 120 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
* 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 (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 (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 (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 18:09:39 +01:00
bef8e3ba42
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 17:04:28 +00:00
2a122a25fa
Translate notification strings
2017-05-30 17:39:41 +01:00
b9d13c6113
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 16:29:10 +00:00
485d080f85
Merge pull request #4085 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
2199fd7959
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 15:50:51 +00:00
3f04a42229
Smaller font size on timestamp to better fit in the available space
...
Part of addressing vector-im/riot-web#4046
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-30 09:32:27 -06:00
1b4444cc73
Add missing translations
2017-05-30 16:30:56 +01:00
7e21e00c99
Translate src/components/structures
2017-05-30 16:27:48 +01:00
90a308e6cb
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 15:12:53 +00:00
469bb8fbc6
Merge pull request #4079 from vector-im/rav/node_versions
...
Make travis run the build with several versions of node
2017-05-30 16:06:48 +01:00
60a56d0617
Merge pull request #4056 from vector-im/t3chguy/piwik
...
Piwik Analytics
2017-05-30 15:59:08 +01:00
eaaca91ba2
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 14:55:37 +00:00
33b95d4965
Standardise on node v6/v7
2017-05-30 15:53:21 +01:00
e5009a0932
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 14:48:13 +00:00
6568249558
Translated using Weblate (German)
...
Currently translated at 99.1% (119 of 120 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-05-30 14:47:50 +00:00
79b1031e39
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 14:46:43 +00:00
e358ef5bf7
Merge pull request #4076 from vector-im/luke/fix-tests-that-expect-directory
...
Fix some tests that expect Directory (they should expect HomePage)
2017-05-30 15:24:46 +01:00
e405d3f179
Merge pull request #4077 from RiotTranslate/weblate-riot-web-riot-web
...
Update from Weblate.
2017-05-30 15:09:18 +01:00
d96c3656a6
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 14:01:24 +00:00
8e1dea7bd1
Merge pull request #4078 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
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
a61b7af17a
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 13:14:29 +00:00
e15d070e8f
[WEBLATE] fix issues.
2017-05-30 13:11:04 +00:00
83926eefce
Added translation using Weblate (Telugu)
2017-05-30 12:22:01 +00:00
6cc7fa3a36
Expect a HomePage now instead of a directory, because one is now shown by default
2017-05-30 12:55:50 +01:00
0e96968c4e
explicitly call install:electron in case electron-builder is silly
...
(which has hit me once)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 12:35:57 +01:00
53b7b6cb14
Merge branch 't3chguy/electron_settings' of github.com:vector-im/riot-web into t3chguy/electron_settings
2017-05-30 12:34:05 +01:00
662ce3c4b4
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_settings
2017-05-30 12:33:41 +01:00
c54e2a30b6
explicitly hide because setApplicationMenu on Linux otherwise shows...
...
https://github.com/electron/electron/issues/9621
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-30 12:33:32 +01:00
37b51b8a2a
translate login button
2017-05-30 12:25:27 +01:00
db602f2bc0
Merge branch 'develop' into t3chguy/electron_profiles
2017-05-30 11:00:51 +01:00
b27600adbe
Improve for Mac - Tested on 10.10.5
2017-05-30 10:53:01 +01:00
543f4efc37
Merge pull request #3925 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
b3426a1268
Update from Weblate. ( #4064 )
...
* 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
1f4f86b5f8
rework tom's welcome page to fit in slightly better with riot's UI/UX
...
* moves login button to top-left
* switches from iframe to a request() to load the welcome page to inherit CSS (probably breaks RTS :/)
* namespace CSS
* change the layout a bit.
2017-05-30 03:58:45 +01:00
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
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
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
1d2bd68200
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/electron_settings
2017-05-29 22:12:06 +01:00
b9ec25b32f
add flow annotation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 20:03:21 +01:00
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
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
dda73cecf9
make eslint happy about MatrixToolbar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 19:12:04 +01:00
1af86405bd
Merge branch 'new-guest-access' into tom-welcome-page
2017-05-29 18:38:57 +01:00
823fbafe85
WIP improvements on welcome page; fix indentation, some verbiage and some CSS
2017-05-29 18:37:35 +01:00
RiotTranslate