PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
5341 commits 1 branch 0 tags 338 MiB
Commit graph

5341 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff
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
Richard van der Hoff
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
Weblate
81d0388021 Merge remote-tracking branch 'origin/develop' into develop 2017-06-15 16:35:46 +00:00
strixaluco
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
Max Sandholm
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
Walter
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
IMIN
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
David Baker
82436758b2 v0.9.5-rc.1 2017-06-15 17:17:17 +01:00
David Baker
1f8566cbdb Prepare changelog for v0.9.5-rc.1 2017-06-15 17:17:17 +01:00
David Baker
198d85a673 js-sdk 0.7.12-rc.1 2017-06-15 17:15:26 +01:00
Richard van der Hoff
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
Richard van der Hoff
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
David Baker
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
Luke Barnard
9d74001f4f Show a spinner when accepting an invite and waitingForRoom 2017-06-15 15:32:01 +01:00
David Baker
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
Luke Barnard
cc46fd34d7 Only stop peeking if at some point we were joined 2017-06-15 14:21:23 +01:00
David Baker
8f9bf5f093 Merge branch 'develop' into erikj/group_server 2017-06-15 14:19:46 +01:00
Luke Barnard
5c37d591b0 Unbreak auto joining 2017-06-15 13:35:19 +01:00
Luke Barnard
fc7da536d6 Add forceUpdate for memberships !== join 2017-06-15 13:32:56 +01:00
Luke Barnard
30566beb43 Fix if-statement thinko 2017-06-15 13:28:52 +01:00
Luke Barnard
d55d61e456 Remove redundant isUserJoined 2017-06-15 12:37:01 +01:00
Luke Barnard
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
IMIN
559f29d6be Added translation using Weblate (Korean) 2017-06-15 10:44:22 +00:00
Tom Tryfonidis
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
Tom Tryfonidis
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
GrigRUSS
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
Richard van der Hoff
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
Richard van der Hoff
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
Richard van der Hoff
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
strixaluco
5e4e12316b Added translation using Weblate (Ukrainian) 2017-06-14 20:20:51 +00:00
David Baker
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
Luke Barnard
58554cce53 Remove racey condition 
joining might become false before we get the room down the sync
 2017-06-14 17:13:13 +01:00
Luke Barnard
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
Richard van der Hoff
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
Luke Barnard
ed5f01d46f Add logging for diagnosis 2017-06-14 16:53:21 +01:00
Luke Barnard
b5fd78a97f Only attempt to peek once in the lifetime of RoomView 2017-06-14 16:50:46 +01:00
Luke Barnard
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
David Baker
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
David Baker
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
David Baker
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
Luke Barnard
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
David Baker
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
David Baker
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
Luke Barnard
f25c081007 When not specified, remove roomAlias state in RoomViewStore 2017-06-14 12:05:25 +01:00
GrigRUSS
a2322853a1 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-14 10:47:18 +00:00
Tom Tryfonidis
7983f9af87 Translated using Weblate (Greek) 
Currently translated at 96.7% (877 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
 2017-06-14 10:19:45 +00:00
David Baker
74a74bc75d Merge branch 'master' into develop 2017-06-14 11:18:56 +01:00
Krombel
b916bc97b1 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-14 10:17:13 +00:00
David Baker
a5aa497287 v0.9.4 2017-06-14 11:17:00 +01:00
David Baker
1b41401ed6 Prepare changelog for v0.9.4 2017-06-14 11:17:00 +01:00