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
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
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
d22e99345f
Merge branch 'master' into develop
2017-06-14 11:24:53 +01:00
4edd21ba8a
v0.11.1
2017-06-14 11:21:27 +01:00
90cff5d7bf
Prepare changelog for v0.11.1
2017-06-14 11:21:27 +01:00
9325eef650
v0.11.1
2017-06-14 11:20:05 +01:00
f9795232e0
react-sdk 0.9.4
2017-06-14 11:19:43 +01:00
c3ef2f86d6
Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-14 10:56:22 +01:00
11c04abaeb
Merge pull request #4305 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-14 10:55:42 +01:00
5d93c675e1
Merge remote-tracking branch 'origin/develop' into develop
2017-06-14 09:34:58 +00:00
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
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
58a323b391
i18n for setting email after password flow
2017-06-14 10:18:48 +01:00
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
ea9aae3902
Merge remote-tracking branch 'origin/develop' into develop
2017-06-14 08:57:24 +00:00
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
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
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
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
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
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
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
a24acaee54
Merge remote-tracking branch 'origin/develop' into develop
2017-06-13 17:38:24 +00:00
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
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
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
c8416b0321
i18n for setting email after password flow
2017-06-13 18:31:35 +01:00
27b8568fc0
Merge pull request #4290 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-13 13:07:00 +01:00
dfd9f7c27b
New icons for riot-ios & riot-translations
2017-06-13 13:06:38 +01:00
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
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
13231620f1
Merge pull request #4290 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-13 10:52:06 +01:00
f2f8c19f2f
Merge remote-tracking branch 'origin/develop' into develop
2017-06-13 09:06:26 +00:00
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
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
5e530a2065
New icons for riot-ios & riot-translations
2017-06-13 10:06:10 +01:00
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
8967403bca
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-12 21:47:38 +00:00
0b83baeaf4
Don't show the tooltips when filtering rooms
...
Fixes https://github.com/vector-im/riot-web/issues/4281
2017-06-12 18:11:00 +01:00
1ce1d36e99
Merge remote-tracking branch 'origin/develop' into develop
2017-06-12 17:09:57 +00:00
1bb7c54ab4
Merge pull request #4282 from vector-im/dbkr/dont_show_emptycontent_in_search
...
Don't show the tooltips when filtering rooms
2017-06-12 18:09:54 +01:00
91295c68ad
Don't show the tooltips when filtering rooms
...
Fixes https://github.com/vector-im/riot-web/issues/4281
2017-06-12 17:54:58 +01:00
c43b30f2fd
Missing bracket in translation
2017-06-12 17:35:44 +01:00
ac25cf56fb
Fix broken riot.im link on homepage
...
For want of a quote the something something
Also add noopeners
2017-06-12 17:35:14 +01:00
2be54f58fe
Merge remote-tracking branch 'origin/develop' into develop
2017-06-12 16:34:09 +00:00
bbb9dd9228
Fix broken riot.im link on homepage
...
For want of a quote the something something
Also add noopeners
2017-06-12 17:33:02 +01:00
3cb8fa096b
Merge remote-tracking branch 'origin/develop' into develop
2017-06-12 15:49:28 +00:00
a3240b934f
Missing bracket in translation
2017-06-12 16:49:09 +01:00
5fa8ee315a
Merge remote-tracking branch 'origin/develop' into develop
2017-06-12 15:07:53 +00:00
Richard van der Hoff