cebb7182f0
try to make hiding events work with read markers
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-15 20:17:59 +01:00
a097357baf
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part
2017-06-15 20:10:32 +01:00
c53fb08453
pass user settings from above
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-15 20:02:17 +01:00
4b34a2b169
modernize imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-15 19:57:48 +01:00
a0a4fe62d5
make hide joins/parts work for MELS and highlighted/permalink event
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-15 19:53:34 +01:00
f5b2a92e84
Give the login panel a bit longer to appear
2017-06-15 18:17:00 +01:00
7b526308fd
Rearrange MatrixChat.render for sanity
...
no-op to make it into a nice simple switch-like arrangement
2017-06-15 17:57:24 +01:00
90213ce72e
MatrixChat: Replace state.{loading,loggedIn,loggingIn} with views
...
MatrixChat is essentially a glorified state machine, with its states partially
determined by the loading, loggedIn and loggingIn state flags. If we actually
make each of the states implied by those flags an explicit 'view', then
everything gets much clearer.
2017-06-15 17:57:24 +01:00
1fcd462660
Tweak tests to match updates to matrixchat
...
Mostly this is just making it look at the `view` state rather than the
individual boolean flags.
One other tweak merits explanation: we now implement the initial
couldn't-register-as-guest login with an explicit switch to the LOGIN view,
which means that the URL gets updated to #/login.
2017-06-15 17:52:18 +01:00
81d0388021
Merge remote-tracking branch 'origin/develop' into develop
2017-06-15 16:35:46 +00:00
96e76ce42e
Translated using Weblate (Ukrainian)
...
Currently translated at 10.5% (96 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-06-15 16:35:41 +00:00
accb4dc591
Translated using Weblate (Swedish)
...
Currently translated at 35.6% (323 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2017-06-15 16:35:41 +00:00
12c2272fcd
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 16:35:41 +00:00
dac9e511c9
Translated using Weblate (Korean)
...
Currently translated at 26.6% (241 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-15 16:35:41 +00:00
104cb7b999
v0.11.2-rc.1
2017-06-15 17:21:01 +01:00
5b43431bf0
Prepare changelog for v0.11.2-rc.1
2017-06-15 17:21:00 +01:00
e045b35c86
v0.11.2-rc.1
2017-06-15 17:20:22 +01:00
cb905e9be7
released js-sdk & react-sdk
2017-06-15 17:18:33 +01:00
82436758b2
v0.9.5-rc.1
2017-06-15 17:17:17 +01:00
1f8566cbdb
Prepare changelog for v0.9.5-rc.1
2017-06-15 17:17:17 +01:00
198d85a673
js-sdk 0.7.12-rc.1
2017-06-15 17:15:26 +01:00
ce42a9a06f
Replace MatrixChat.state.screen with 'view'
...
'screen' is overloaded, as it us used for the parameter of `showScreen` (and,
by implication, `state.screenAfterLogin`). Attempt to clear up the confusion by
replacing 'screen' with 'view' and using some constants for the potential
values.
This should be a no-op!
2017-06-15 16:41:17 +01:00
28753c451d
Merge remote-tracking branch 'origin/develop' into develop
2017-06-15 15:29:41 +00:00
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
854aed746a
Merge remote-tracking branch 'origin/develop' into develop
2017-06-15 15:13:08 +00:00
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
1f48b4caa6
Merge pull request #1098 from matrix-org/rav/test_rts_login
...
Groundwork for tests including a teamserver login
2017-06-15 16:12:28 +01:00
a28af8bcc6
Extend timeouts in joining tests again
...
this seems to work? maybe?
2017-06-15 16:01:26 +01:00
13efd62964
Merge pull request #1100 from matrix-org/luke/fix-show-spinner-on-accept-invite
...
Show a spinner when accepting an invite and waitingForRoom
2017-06-15 15:54:30 +01:00
43f56483aa
Merge branch 'develop' into rav/deflakify_joining_test
2017-06-15 15:48:13 +01:00
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
9d74001f4f
Show a spinner when accepting an invite and waitingForRoom
2017-06-15 15:32:01 +01:00
ca736cfce8
fix test description
...
logs in, not registers
2017-06-15 14:54:32 +01:00
269a82c65f
Merge remote-tracking branch 'origin/develop' into develop
2017-06-15 13:52:04 +00:00
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
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
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
Michael Telatynski
Richard van der Hoff
Weblate
strixaluco
Max Sandholm
Walter
IMIN
David Baker
Richard van der Hoff
David Baker
Luke Barnard
Alexandr Kornienko
Tom Tryfonidis