3884c5ccf0
Log an error on unknown state instead of throwing
2017-06-16 11:51:12 +01:00
5e5639b730
Fix half-written comment
2017-06-16 11:50:53 +01:00
739a120cf0
Merge pull request #1108 from matrix-org/luke/fix-not-showing-next-room-on-reject
...
Correctly inspect state when rejecting invite
2017-06-16 11:34:10 +01:00
82b2da7833
Correctly inspect state when rejecting invite
...
So that we view_next_room if we're looking at the room we're rejecting
2017-06-16 11:27:47 +01:00
64b555dfe3
Merge pull request #1107 from matrix-org/luke/fix-use-room-alias-in-preview
...
Make sure to pass the roomAlias to the preview header if we have it
2017-06-16 11:21:03 +01:00
807f01b57e
Make sure to pass the roomAlias to the preview header if we have it
2017-06-16 11:10:55 +01:00
34e40c36bd
Merge remote-tracking branch 'origin/develop' into develop
2017-06-16 09:42:20 +00:00
cb14b28eb1
Translated using Weblate (Ukrainian)
...
Currently translated at 16.8% (153 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-06-16 09:42:16 +00:00
6be3aefe05
Translated using Weblate (Swedish)
...
Currently translated at 43.8% (397 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2017-06-16 09:42:16 +00:00
512c059f4e
Translated using Weblate (Spanish)
...
Currently translated at 52.6% (477 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-06-16 09:42:15 +00:00
c57ff5933d
Translated using Weblate (Korean)
...
Currently translated at 55.5% (503 of 906 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-16 09:42:15 +00:00
a0be1706a9
Translated using Weblate (German)
...
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/de/
2017-06-16 09:42:15 +00:00
3b23fc75ae
Merge pull request #1106 from matrix-org/dbkr/reset_captcha_on_unmount
...
Make sure captcha disappears when container does
2017-06-16 10:36:28 +01:00
2a01e638b7
Make sure captcha disappears when container does
...
Should fix https://github.com/vector-im/riot-web/issues/4095
2017-06-16 10:25:51 +01:00
56eb71d19f
Merge pull request #1105 from matrix-org/dbkr/fix_url_previews
...
Fix URL previews
2017-06-16 09:34:41 +01:00
af6392d7ca
Fix URL previews
...
and also things like the unsent message error and encryption
warning.
Stuff that we need to do at room view mount time had got moved into
a clause of the if statement in onHaveRoom and so wasn't being
executed.
Fixes https://github.com/vector-im/riot-web/issues/4327
2017-06-15 22:57:41 +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
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
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
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
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
9d74001f4f
Show a spinner when accepting an invite and waitingForRoom
2017-06-15 15:32:01 +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
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
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
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
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
5e4e12316b
Added translation using Weblate (Ukrainian)
2017-06-14 20:20:51 +00: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
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
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
Richard van der Hoff