OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
3,934 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

3934 Commits (55fad1910a72d642fdc38d9c2b11fde4fe094429)

Author SHA1 Message Date
Weblate 55fad1910a Merge remote-tracking branch 'origin/develop' into develop 2017-06-16 11:56:45 +00:00
David Baker 00c2235381 Merge pull request #4323 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-16 12:56:41 +01:00
Weblate aff2a50cdd Merge remote-tracking branch 'origin/develop' into develop 2017-06-16 10:48:34 +00:00
IMIN 5bc676a042 Translated using Weblate (Korean) 
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/ko/
 2017-06-16 10:48:34 +00: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
Enrique 319cdd56e3 Translated using Weblate (Spanish) 
Currently translated at 58.0% (116 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2017-06-16 09:42:41 +00:00
IMIN 2477fddc07 Translated using Weblate (Korean) 
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/ko/
 2017-06-16 09:42:41 +00:00
Bamstam 3bf7de8d47 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-16 09:42:40 +00:00
Silke 5da8839ceb Translated using Weblate (Dutch) 
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/nl/
 2017-06-16 09:42:40 +00:00
Weblate 28753c451d Merge remote-tracking branch 'origin/develop' into develop 2017-06-15 15:29:41 +00: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
Weblate 854aed746a Merge remote-tracking branch 'origin/develop' into develop 2017-06-15 15:13:08 +00: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
IMIN f3d29b305e Translated using Weblate (Korean) 
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/ko/
 2017-06-15 14:39:34 +00:00
Richard van der Hoff ca736cfce8 fix test description 
logs in, not registers
 2017-06-15 14:54:32 +01:00
Weblate 269a82c65f Merge remote-tracking branch 'origin/develop' into develop 2017-06-15 13:52:04 +00:00
Alexandr Kornienko 680a345ce7 Translated using Weblate (Ukrainian) 
Currently translated at 98.0% (196 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
 2017-06-15 13:52:04 +00:00
IMIN 3b6c0e0f67 Translated using Weblate (Korean) 
Currently translated at 82.5% (165 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
 2017-06-15 13:52:03 +00:00
Tom Tryfonidis 9de3c71a9b 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-15 13:52:03 +00: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
IMIN 8f3c0d6233 Added translation using Weblate (Korean) 2017-06-15 10:43:19 +00:00
strixaluco 4f5f32d75c Translated using Weblate (Ukrainian) 
Currently translated at 98.0% (196 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
 2017-06-15 09:27:47 +00:00
Olivier Nyssen 59d67a483b Added translation using Weblate (Bengali (India)) 2017-06-15 08:57:35 +00:00
Olivier Nyssen 6709f922be Added translation using Weblate (Bengali (Bangladesh)) 2017-06-15 04:10:16 +00: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
Olivier Nyssen 9649f279a3 Added translation using Weblate (Hindi) 2017-06-14 21:30:07 +00:00
Olivier Nyssen 181ef8ab7e Added translation using Weblate (Indonesian) 2017-06-14 21:29:40 +00: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
Weblate fef525c2e5 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 16:09:14 +00: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
Weblate 165b3dbdd3 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 15:59:03 +00: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
GrigRUSS c01df23040 Translated using Weblate (Russian) 
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/ru/
 2017-06-14 10:44:43 +00: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