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
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
c32b717723
Merge pull request #1099 from matrix-org/luke/fix-spinner-until-room-available
...
Display a spinner until new room object after join success
2017-06-15 14:34:15 +01:00
cc46fd34d7
Only stop peeking if at some point we were joined
2017-06-15 14:21:23 +01:00
8f9bf5f093
Merge branch 'develop' into erikj/group_server
2017-06-15 14:19:46 +01:00
5c37d591b0
Unbreak auto joining
2017-06-15 13:35:19 +01:00
fc7da536d6
Add forceUpdate for memberships !== join
2017-06-15 13:32:56 +01:00
30566beb43
Fix if-statement thinko
2017-06-15 13:28:52 +01:00
d55d61e456
Remove redundant isUserJoined
2017-06-15 12:37:01 +01:00
b90ceaa111
Display a spinner until new room object after join success
...
If we successfully join, display a spinner until the js-sdk indicates (via room membership event or room event) that we can start using the room normally. A room event indicates we have never seen that room which means we need to use the new room object to clobber state.room. This is to make sure we replace the room that is set up for peeking with the room that can be used normally. For historical rooms, this isn't a problem.
This is a workaround for the fact that when peeking, the js-sdk calls onRoom, which is difficult to handle from the clients perspective because onRoom should only be called for rooms that you've never seen before. But if you peek a room that you've joined and left and get an onRoom, you run into trouble. You also can't just always use onRoomMembership because this won't be triggered for the first time you see the room. So we end up using a combination of both.
See https://github.com/matrix-org/matrix-js-sdk/issues/464 for discussion on improving this
2017-06-15 12:01:16 +01:00
559f29d6be
Added translation using Weblate (Korean)
2017-06-15 10:44:22 +00:00
8f3c0d6233
Added translation using Weblate (Korean)
2017-06-15 10:43:19 +00:00
2172dd5325
Translated using Weblate (Greek)
...
Currently translated at 100.0% (906 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-15 09:39:59 +00:00
ca46314613
Translated using Weblate (Greek)
...
Currently translated at 99.5% (902 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-15 09:32:23 +00:00
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
59d67a483b
Added translation using Weblate (Bengali (India))
2017-06-15 08:57:35 +00:00
c5ae1dabe1
Translated using Weblate (Russian)
...
Currently translated at 100.0% (906 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-15 06:37:40 +00:00
6709f922be
Added translation using Weblate (Bengali (Bangladesh))
2017-06-15 04:10:16 +00:00
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
65f351ff22
Clear Lifecycle.RtsClient on MatrixChat.mount
...
- otherwise it ends up sitting around and failing later tests.
2017-06-15 02:15:13 +01:00
9ff52b182f
Allow fetch() to be stubbed for the RtsClient
...
- so that we can write some tests for it.
2017-06-15 01:52:24 +01:00
a05bafed6a
Remove sarcastic comments
...
... apparently I wrote them, and I don't understand them. There is *supposed*
to be a global flux dispatcher.
This reverts commit c0de0870ed
2017-06-14 23:03:40 +01:00
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
9649f279a3
Added translation using Weblate (Hindi)
2017-06-14 21:30:07 +00:00
181ef8ab7e
Added translation using Weblate (Indonesian)
2017-06-14 21:29:40 +00:00
5e4e12316b
Added translation using Weblate (Ukrainian)
2017-06-14 20:20:51 +00:00
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
2017-06-14 18:01:44 +01:00
8840625045
Merge pull request #1097 from matrix-org/luke/attempt-fix-peeking-regression
...
Luke/attempt fix peeking regression
2017-06-14 17:33:45 +01:00
58554cce53
Remove racey condition
...
joining might become false before we get the room down the sync
2017-06-14 17:13:13 +01:00
fef525c2e5
Merge remote-tracking branch 'origin/develop' into develop
2017-06-14 16:09:14 +00:00
5ff59b0c23
Tests: delete indexeddbs after running
2017-06-14 17:08:49 +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
9e3efb54d3
Merge pull request #1096 from matrix-org/dbkr/fix_warm_fuzzy_text_mk_2
...
Show correct text in set email password dialog (2)
2017-06-14 16:59:12 +01:00
165b3dbdd3
Merge remote-tracking branch 'origin/develop' into develop
2017-06-14 15:59:03 +00: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
e9aac09105
Merge pull request #1092 from matrix-org/rav/no_resume_client_on_login
...
Don't create a guest login if user went to /login
2017-06-14 16:58:12 +01:00
ed5f01d46f
Add logging for diagnosis
2017-06-14 16:53:21 +01:00
b5fd78a97f
Only attempt to peek once in the lifetime of RoomView
2017-06-14 16:50:46 +01:00
2d6ba056d1
Attempt to follow closely what RoomView did pre-ILAG
...
In terms of peeking and what happens to the state when joining. This is another attempt to mitigate https://github.com/vector-im/riot-web/issues/4307
2017-06-14 16:48:34 +01:00
9ecf82a1f2
Show correct text in set email password dialog (2)
...
Fixes https://github.com/vector-im/riot-web/issues/4311
The cancel button onClick was hooked directly up to onFinished, so
the mouse event ended up as the boolean for whether an email had
been set.
2017-06-14 16:06:28 +01:00
449c65b784
Merge pull request #1095 from matrix-org/luke/fix-guest-password-success-and-email-set
...
Give password confirmation correct title, description
2017-06-14 15:16:36 +01:00
602255f92c
Merge pull request #1094 from matrix-org/dbkr/enter_submits_changepassword
...
Make enter submit change password form
2017-06-14 15:16:11 +01:00
1d4a3ae5a3
Give password confirmation correct title, description
...
Fixes https://github.com/vector-im/riot-web/issues/4311
This was due to `BaseDialog` calling `onFinished` with a mouse event instead of `false` (and it was assumed to call with `true/false`, but doesn't)
2017-06-14 14:58:39 +01:00
57ef6f3cf8
Make enter submit change password form
...
Fixes https://github.com/vector-im/riot-web/issues/4302
2017-06-14 14:50:48 +01:00
aba0d45db5
Merge pull request #1086 from matrix-org/rob/apps
...
App widget improvements and Jitsi
2017-06-14 15:21:24 +02:00
302233db90
Merge pull request #1093 from matrix-org/luke/undefined-room-alias-if-not-specified-view-room
...
When not specified, remove roomAlias state in RoomViewStore
2017-06-14 14:17:06 +01:00
edb11d805e
AppsDrawer: Open add app widget if opening empty drawer
...
This felt much better than having to also click the add app widget
button.
2017-06-14 15:05:29 +02:00
5f020423bc
AddAppDialog: Put the submit button inside the form
2017-06-14 15:05:11 +02:00
2d3c886646
AppsDrawer: Generate room alias for vrdemo
2017-06-14 13:27:15 +02:00
9c8ab2691b
AppsDrawer: Only append queryParams once
2017-06-14 13:26:43 +02:00
Tom Tryfonidis
Richard van der Hoff
David Baker
Luke Barnard
David Baker
IMIN
strixaluco
Olivier Nyssen
GrigRUSS
Richard van der Hoff
Weblate
Luke Barnard
Robert Swain
Robert Swain