David Baker
88e843d992
Merge pull request #4201 from vector-im/luke/fix-tests
...
Fix tests for new-guest-access
2017-06-05 21:25:59 +01:00
Luke Barnard
feaff9d99d
Fix tests for new-guest-access
...
This time the test wasn't being flaky, but it does inspect a lot of the internal of RoomView, which has had some modifications recently. I've updated the test to reflect this and it passes locally.
Also, fix a bug in HomePage with an undeclared "error" which should be "err".
Let's see what Travis thinks of this!
2017-06-05 20:16:44 +01:00
Luke Barnard
5e67bcdac7
Merge pull request #4198 from vector-im/luke/ilag-i18n
...
i18n for SetPasswordDialog
2017-06-05 17:00:21 +01:00
Luke Barnard
0919b7ce3a
i18n for SetPasswordDialog
2017-06-05 16:13:44 +01:00
Luke Barnard
13262d9a8b
Merge pull request #4163 from vector-im/directory-link-fix
...
Update home.html
2017-06-02 18:08:40 +01:00
Tom Lant
c9bfd6cc9a
Update home.html
2017-06-02 17:40:11 +01:00
David Baker
8f5f4cb9c8
Merge pull request #4160 from vector-im/dbkr/missing_tr_room_dir
...
Add missing translation for room directory
2017-06-02 17:08:55 +01:00
David Baker
4f0fee2cd1
Add missing translation for room directory
...
Also remove newline in translation string.
2017-06-02 17:02:17 +01:00
Luke Barnard
7b7ae356eb
Use ?action=chat for RiotBot link
...
Possble thanks to https://github.com/matrix-org/matrix-react-sdk/pull/1006
2017-06-02 14:02:09 +01:00
Luke Barnard
a2378db837
Merge branch 'new-guest-access' of github.com:vector-im/riot-web into new-guest-access
2017-06-01 18:23:12 +01:00
Luke Barnard
188ea3a4b1
CSS for modified ChatcreateOrReuseDialog
2017-06-01 18:23:04 +01:00
Matthew Hodgson
29e58be7f4
Merge pull request #4129 from vector-im/matthew/i18n-welcome
...
i18n welcome
2017-06-01 18:08:17 +01:00
Matthew Hodgson
a8f0ed60cf
Merge branch 'new-guest-access' into matthew/i18n-welcome
2017-06-01 11:16:50 +01:00
Matthew Hodgson
623f995934
fix untested stuff with iframe homepages
2017-06-01 11:13:04 +01:00
Matthew Hodgson
4805bcf364
outline font correctly in svg
2017-06-01 10:50:47 +01:00
Matthew Hodgson
a21c77f4dd
make it work
2017-06-01 00:07:47 +01:00
Matthew Hodgson
17e80d7757
i18n welcome
2017-05-31 11:02:59 +01:00
Matthew Hodgson
e16e52915b
more lipstick to the welcome page
2017-05-31 00:36:57 +01:00
Matthew Hodgson
1e1a43c78f
support iframes for RTS urls
2017-05-30 21:52:43 +01:00
Matthew Hodgson
64a67583e0
Merge pull request #4038 from vector-im/tom-welcome-page
...
Tom welcome page
2017-05-30 21:36:21 +01:00
Matthew Hodgson
d264426ece
Merge branch 'develop' into new-guest-access
2017-05-30 21:06:45 +01:00
Matthew Hodgson
4493994dd5
Merge pull request #4092 from turt2live/travis/12hrtime-hotfix
...
Show 12hr time on hover too
2017-05-30 20:15:00 +01:00
RiotTranslate
e79df6a947
Update from Weblate. ( #4091 )
...
* 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/
* 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 20:14:23 +01:00
Matthew Hodgson
386fcb96fd
Merge pull request #4087 from vector-im/kegan/translation-ape
...
Translate src/notifications
2017-05-30 20:14:10 +01:00
turt2live
676bd6196f
Show 12hr time on hover too
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-30 13:07:49 -06:00
RiotTranslate
045c32bd2e
Update from Weblate. ( #4089 )
...
* 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/
* 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:48:06 +01:00
Matthew Hodgson
f4c7aaf138
Merge pull request #4084 from vector-im/kegan/translation-monkey
...
Translate src/components/structures
2017-05-30 18:13:36 +01:00
RiotTranslate
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
Kegan Dougal
2a122a25fa
Translate notification strings
2017-05-30 17:39:41 +01:00
Matthew Hodgson
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
turt2live
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
Kegan Dougal
1b4444cc73
Add missing translations
2017-05-30 16:30:56 +01:00
Kegan Dougal
7e21e00c99
Translate src/components/structures
2017-05-30 16:27:48 +01:00
Richard van der Hoff
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
Matthew Hodgson
60a56d0617
Merge pull request #4056 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
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
Matthew Hodgson
e405d3f179
Merge pull request #4077 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 #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
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
6cc7fa3a36
Expect a HomePage now instead of a directory, because one is now shown by default
2017-05-30 12:55:50 +01:00
Matthew Hodgson
37b51b8a2a
translate login button
2017-05-30 12:25:27 +01:00
Luke Barnard
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
RiotTranslate
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
Matthew Hodgson
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
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
