Commit Graph

3911 Commits

Author SHA1 Message Date
Richard van der Hoff 6df1574b8b onLoadCompleted is now onTokenLoginCompleted 2017-06-16 15:05:14 +01:00
David Baker 05c667b34b Merge pull request #4332 from vector-im/dbkr/fix_wierd_h2
Fix h2 in markdown being weird
2017-06-16 11:48:31 +01:00
David Baker 2c186aafae Fix h2 in markdown being weird
Date separator style was just define don any h2 in the message
list, so got picked up by any h2s in markdown too. Give date
separators their own class.

Fixes https://github.com/vector-im/riot-web/issues/4328
2017-06-16 11:36:24 +01:00
Richard van der Hoff 584e4c04da Merge pull request #4313 from vector-im/rav/deflakify_joining_test
Attempts to deflakify the joining test
2017-06-15 16:29:37 +01:00
Richard van der Hoff a7a7ffd84b Merge pull request #4315 from vector-im/rav/test_rts_login
Add a test for the login flow when there is a teamserver
2017-06-15 16:13:05 +01:00
Richard van der Hoff a28af8bcc6 Extend timeouts in joining tests again
this seems to work? maybe?
2017-06-15 16:01:26 +01:00
Richard van der Hoff 43f56483aa Merge branch 'develop' into rav/deflakify_joining_test 2017-06-15 15:48:13 +01:00
Richard van der Hoff ca736cfce8 fix test description
logs in, not registers
2017-06-15 14:54:32 +01:00
Richard van der Hoff 2c8c26a16f Merge pull request #4314 from vector-im/rav/remove_onload_simulator
Remove onload simulator from loading test
2017-06-15 14:52:00 +01:00
Richard van der Hoff 98e694646c Add a test for the login flow when there is a teamserver
- just to check it keeps working.
2017-06-15 02:17:24 +01:00
Richard van der Hoff 6f2eee1f03 Attempts to deflakify the joining test
Treat the waitTime passed into `flush` as a timeout rather than a
time-between-loops, so that we can pass in bigger times and not slow the tests
down too much.

Bump the timeout when waiting for /publicRooms and /initialSync in the joining
test.
2017-06-14 22:58:12 +01:00
Richard van der Hoff 4ca009b9f7 Remove onload simulator from loading test
This used to exist to reproduce the functionality in the window.onload handler
in vector/index.js -- which got removed in 31915db. Having it here is confusing
at best.
2017-06-14 18:01:44 +01:00
Richard van der Hoff 5ff59b0c23 Tests: delete indexeddbs after running 2017-06-14 17:08:49 +01:00
Richard van der Hoff 27d5704978 Improve logging in mock-request
Try to make it a bit more obvious what's been going on in mock-request: add
timestamps to lines, and an identifier so that where we have two flushes in
parallel, we can see what's what.
2017-06-14 16:59:46 +01:00
Richard van der Hoff 59da904353 Check that we don't register a guest account on /#/login (#4306)
If you go straight to a /#/login link, we shoudn't go registering guest
accounts or reanimating the saved creds.
2017-06-14 16:59:00 +01:00
David Baker d22e99345f Merge branch 'master' into develop 2017-06-14 11:24:53 +01:00
David Baker 4edd21ba8a v0.11.1 2017-06-14 11:21:27 +01:00
David Baker 90cff5d7bf Prepare changelog for v0.11.1 2017-06-14 11:21:27 +01:00
David Baker 9325eef650 v0.11.1 2017-06-14 11:20:05 +01:00
David Baker f9795232e0 react-sdk 0.9.4 2017-06-14 11:19:43 +01:00
David Baker c3ef2f86d6 Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2017-06-14 10:56:22 +01:00
David Baker 11c04abaeb Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2017-06-14 10:55:42 +01:00
Weblate 5d93c675e1 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 09:34:58 +00:00
Brendan Abolivier 452e35caa1 Translated using Weblate (French)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-06-14 09:34:58 +00:00
Richard van der Hoff d7fb0093e4 Merge pull request #4292 from vector-im/rav/clear_storage_on_login
Test that we handle stored mx_last_room_id correctly
2017-06-14 10:34:55 +01:00
Luke Barnard 58a323b391 i18n for setting email after password flow 2017-06-14 10:18:48 +01:00
Luke Barnard cd8dc5f178 Ask for email address after setting password for the first time
This is so that the user can reset their password.
2017-06-14 09:58:55 +01:00
Weblate ea9aae3902 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 08:57:24 +00:00
AmandineLP 23c6ccc536 Translated using Weblate (French)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-06-14 08:57:24 +00:00
Paul Evans fa9ae945ed Translated using Weblate (Esperanto)
Currently translated at 21.5% (43 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-06-14 08:57:24 +00:00
David Baker 9d42a81709 Merge pull request #4301 from vector-im/luke/set-email-after-password-2
Ask for email address after setting password for the first time
2017-06-14 09:57:21 +01:00
Tom Tryfonidis 46d0e8da96 Translated using Weblate (Greek)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/
2017-06-14 08:42:05 +00:00
Luke Barnard 4f55f810af Ask for email address after setting password for the first time
This is so that the user can reset their password.
2017-06-14 09:30:08 +01:00
AmandineLP 138555759d Translated using Weblate (French)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-06-13 23:07:34 +00:00
Krombel fbe5dfce4d Translated using Weblate (German)
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-06-13 18:01:27 +00:00
Weblate a24acaee54 Merge remote-tracking branch 'origin/develop' into develop 2017-06-13 17:38:24 +00:00
Bamstam 7e272f95ff Translated using Weblate (German)
Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-06-13 17:38:24 +00:00
Jean 5a9d8b0624 Translated using Weblate (French)
Currently translated at 92.9% (184 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-06-13 17:38:24 +00:00
David Baker 7af2a6c3a6 Merge pull request #4299 from vector-im/luke/set-email-after-password
i18n for setting email after password flow
2017-06-13 18:38:21 +01:00
Luke Barnard c8416b0321 i18n for setting email after password flow 2017-06-13 18:31:35 +01:00
David Baker 27b8568fc0 Merge pull request #4290 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2017-06-13 13:07:00 +01:00
David Baker dfd9f7c27b New icons for riot-ios & riot-translations 2017-06-13 13:06:38 +01:00
Richard van der Hoff aa07266f12 Test that we handle stored mx_last_room_id correctly
* Do we show the last room correctly on resume?
 * Do we show the home page if we have no last room?
 * If we follow a login link, and re-log-in, do we correctly vape the
   mx_last_room_id (#4283)
2017-06-13 12:52:35 +01:00
Tom Tryfonidis e2f2d34698 Translated using Weblate (Greek)
Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/el/
2017-06-13 10:45:15 +00:00
David Baker 13231620f1 Merge pull request #4290 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2017-06-13 10:52:06 +01:00
Weblate f2f8c19f2f Merge remote-tracking branch 'origin/develop' into develop 2017-06-13 09:06:26 +00:00
Jean 5812dd8f3f Translated using Weblate (French)
Currently translated at 92.9% (184 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-06-13 09:06:25 +00:00
Justin 03dec86211 Translated using Weblate (Dutch)
Currently translated at 95.4% (189 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2017-06-13 09:06:25 +00:00
David Baker 5e530a2065 New icons for riot-ios & riot-translations 2017-06-13 10:06:10 +01:00
Travis Ralston 278bd61ad9 Translated using Weblate (English (United States))
Currently translated at 100.0% (198 of 198 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/en_US/
2017-06-12 22:22:48 +00:00