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
ac9075a82a
Increase panel height
2017-05-30 10:47:29 +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
8ef7dda7bd
fixing missing OK button on TextInputDialog
2017-05-29 16:43:28 +01:00
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
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
3e7ef112f0
opt out based on analyticsOptOut localSetting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 13:17:12 +01:00
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
8083f2d934
fixing up the link to the translation room
2017-05-29 11:35:13 +01:00
00cf1da758
Added translation using Weblate (Ukrainian)
2017-05-29 06:57:55 +00:00
f085d2db39
make flags less muddy - fixes https://github.com/vector-im/riot-web/issues/3974
2017-05-29 00:10:08 +01:00
a92d96347b
Merge branch 'develop' into new-guest-access
2017-05-28 22:50:53 +01:00
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
da7c6ca856
Merge branch 'develop' into travis/redact-to-remove
2017-05-28 22:41:38 +01:00
47d412df73
Merge pull request #4058 from RiotTranslate/weblate-riot-web-riot-web
...
Update from Weblate.
2017-05-28 21:46:38 +01:00
ab9ecc4f64
remove duplicate i18n keys
2017-05-28 21:35:47 +01:00
3df6ecfe84
Added translation using Weblate (Chinese (Traditional))
2017-05-28 16:11:35 +00:00
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
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
7b00be7f57
remove wrong generated file
2017-05-28 13:34:53 +00:00
efe3c239e1
Added translation using Weblate (Spanish)
2017-05-28 12:41:24 +00:00
44e58d2eff
Added translation using Weblate (_ES (generated))
2017-05-28 12:40:43 +00:00
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
Matthew Hodgson