Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 14:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,273 Commits 206 Branches 552 Tags 519 MiB
e193fa5be5
Commit Graph

4308 Commits

Author SHA1 Message Date
Weblate
a2764a0c1f Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 10:25:04 +00:00
Sebastián Magrí
bfd5f1b09a Translated using Weblate (Spanish) 
Currently translated at 68.9% (625 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-06-19 10:24:54 +00:00
Bamstam
1d958dd120 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-19 10:24:54 +00:00
Nathan van Beelen
c1ce12ef96 Translated using Weblate (Dutch) 
Currently translated at 55.0% (499 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2017-06-19 10:24:54 +00:00
Luke Barnard
513a585a3e Merge pull request #1076 from ollieh/issues/reduce-save-restore-window 
Reduce save-restore window in ScrollPanel to reduce scrolling jumps
 2017-06-19 11:23:10 +01:00
Richard van der Hoff
a5d65ee391 Get rid of guestCreds 
-- we just keep the MatrixClient running in the background, so it is easy to
resume.
 2017-06-19 10:36:25 +01:00
Richard van der Hoff
3b518f2c59 Fix race in registration for pusher config 
we no longer immediately create the MatrixClient, so don't assume we do.
 2017-06-19 10:22:18 +01:00
Richard van der Hoff
115a3deed9 Merge pull request #1102 from matrix-org/rav/refactor_matrixclient_states 
Refactor the state machine in MatrixChat
 2017-06-19 08:53:50 +01:00
Richard van der Hoff
cb29d92912 Merge pull request #1110 from matrix-org/rav/fix_token_redirect 
Avoid transitioning to loggedIn state during token login
 2017-06-19 08:52:22 +01:00
Matthew Hodgson
032650e095 Merge branch 'develop' into t3chguy/fix_forwarding 2017-06-19 01:53:35 +01:00
Matthew Hodgson
fac98d16dd fix broken i18n 2017-06-19 00:11:34 +01:00
Matthew Hodgson
022161b78f fix broken vars 2017-06-19 00:08:29 +01:00
Weblate
5d370e47d3 Merge remote-tracking branch 'origin/develop' into develop 2017-06-18 22:43:50 +00:00
strixaluco
194ea28956 Translated using Weblate (Ukrainian) 
Currently translated at 17.3% (157 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2017-06-18 22:43:49 +00:00
Sebastián Magrí
e957e77d7e Translated using Weblate (Spanish) 
Currently translated at 67.9% (616 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-06-18 22:43:49 +00:00
Walter
4edca7a029 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-18 22:43:49 +00:00
IMIN
48c336a8bd Translated using Weblate (Korean) 
Currently translated at 72.0% (653 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2017-06-18 22:43:48 +00:00
Szimszon
8a76f09250 Translated using Weblate (Hungarian) 
Currently translated at 56.1% (509 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-06-18 22:43:48 +00:00
PurgingPanda
123d742a60 Translated using Weblate (Dutch) 
Currently translated at 39.7% (360 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2017-06-18 22:43:48 +00:00
zwindl
d05d9ab38f Translated using Weblate (Chinese (Simplified)) 
Currently translated at 39.1% (355 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2017-06-18 22:43:48 +00:00
Carlos A. Carnero Delgado
40fa5ddb17 Translated using Weblate (Spanish) 
Currently translated at 67.6% (613 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-06-18 22:15:25 +00:00
Gary
75b330c208 Translated using Weblate (Dutch) 
Currently translated at 36.3% (329 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2017-06-18 15:02:00 +00:00
Eric Newport
1bc9858200 Translated using Weblate (English (United States)) 
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/en_US/
 2017-06-18 06:29:38 +00:00
David Pérez-Suárez
e0e18d25ea Translated using Weblate (Spanish) 
Currently translated at 67.6% (613 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-06-18 00:58:28 +00:00
Enrique
18971458df Translated using Weblate (Spanish) 
Currently translated at 67.5% (612 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-06-17 23:37:54 +00:00
Luke Barnard
ba95d7a16c Merge pull request #1113 from matrix-org/luke/fix-no-peek-on-create 
Don't peek when creating a room
 2017-06-16 18:35:20 +01:00
Luke Barnard
be58e1095e Don't peek when creating a room 
This causes a race between receiving the room when starting to peek and receiving the room from joining it - https://github.com/vector-im/riot-web/issues/4330, https://github.com/matrix-org/riot-web-rageshakes/issues/196
 2017-06-16 18:24:07 +01:00
Michael Telatynski
7b4cd31124 make forward_message be friendly with the RVS stuffs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 16:12:52 +01:00
David Baker
aa7ddfe86e Remove unused collapse_rhs 
Remove all the places we pass collapse_rhs through to places it's
never used. Remove the commented RHS collapse button from
SimpleRoomHeader.
 2017-06-16 15:47:40 +01:00
Richard van der Hoff
db3d9c0573 Make Lifecycle.loadSession return an explicit result 
- rather than inferring it from the fact it didn't call logging_in.
 2017-06-16 15:23:09 +01:00
Richard van der Hoff
5f689b7929 Merge branch 'rav/fix_token_redirect' into rav/refactor_matrixclient_states_tmp 2017-06-16 15:20:47 +01:00
Richard van der Hoff
eb1fc9ae2d Avoid transitioning to loggedIn state during token login 
Fixes riot-web#4334

When we do a token login, don't carry on with the normal app startup
(transitioning to the loggedIn state etc) - instead tell the app about the
successful login and wait for it to redirect.

Replace onLoadCompleted with onTokenLoginCompleted so that the app can see what
it's supposed to be doing.
 2017-06-16 15:05:53 +01:00
David Baker
6a2c2d64fa Merge pull request #1109 from matrix-org/rav/fix_cas_login 
Avoid getting stuck in a loop in CAS login
 2017-06-16 13:21:52 +01:00
Richard van der Hoff
1f719b3f7d Avoid getting stuck in a loop in CAS login 
498ea53 made it so that the #/login URL fragment was prioritised over the token
params in the query string; unfortunately that also means that CAS login gets
stuck in a loop where you always get redirected back to the login view.

Prioritising the URL fragment over the token params may or may not be the
correct thing to, but I also think it's incorrect that we ask the CAS server to
redirect us back to #/login. Accordingly, the easiest fix here is just to clear
the URL fragment before redirecting to CAS.
 2017-06-16 13:06:28 +01:00
Weblate
d2d47bd8a2 Merge remote-tracking branch 'origin/develop' into develop 2017-06-16 11:51:35 +00:00
IMIN
af7a82cdae Translated using Weblate (Korean) 
Currently translated at 64.2% (582 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 11:51:31 +00:00
Richard van der Hoff
3884c5ccf0 Log an error on unknown state instead of throwing 2017-06-16 11:51:12 +01:00
Richard van der Hoff
5e5639b730 Fix half-written comment 2017-06-16 11:50:53 +01:00
Luke Barnard
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
David Baker
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
Luke Barnard
807f01b57e Make sure to pass the roomAlias to the preview header if we have it 2017-06-16 11:10:55 +01:00
Weblate
34e40c36bd Merge remote-tracking branch 'origin/develop' into develop 2017-06-16 09:42:20 +00:00
strixaluco
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
Max Sandholm
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
Enrique
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
IMIN
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
Bamstam
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
David Baker
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
David Baker
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
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
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
Luke Barnard
9d74001f4f Show a spinner when accepting an invite and waitingForRoom 2017-06-15 15:32:01 +01:00
Luke Barnard
cc46fd34d7 Only stop peeking if at some point we were joined 2017-06-15 14:21:23 +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
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
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
Richard van der Hoff
5d649626b0 Merge remote-tracking branch 'origin/develop' into rav/no_resume_client_on_login 2017-06-14 11:08:16 +01:00
Richard van der Hoff
498ea53995 Don't create a guest login if user went to /login 
This fixes an unintuitive behaviour where, if you follow a link to
riot.im/app/#/login, we take you to the login page, but not before we've
registered a guest account (or restarted the MatrixClient with the stored
creds).

This actually ends up simplifying some of the startup dance, as we special-case
the registration flows earlier on.
 2017-06-14 11:02:38 +01:00
David Baker
2a51aec193 Merge pull request #1091 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-14 10:55:24 +01:00
Luke Barnard
57dfbc4701 Remove unused imports 2017-06-14 10:53:02 +01:00
Luke Barnard
040f28463d Merge pull request #1045 from ollieh/issues/4009 
Fixed pagination infinite loop caused by long messages
 2017-06-14 10:40:02 +01:00
Richard van der Hoff
9e70884415 Merge pull request #1085 from matrix-org/rav/clear_storage_on_login 
Clear persistent storage on login and logout
 2017-06-14 10:34:26 +01:00
David Baker
b4e216ba23 Merge pull request #1087 from matrix-org/dbkr/dm_guess_oldest_joined 
DM guessing: prefer oldest joined member
 2017-06-14 10:30:46 +01:00
Weblate
755005b1c6 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 09:30:04 +00:00
Brendan Abolivier
9495d5b631 Translated using Weblate (French) 
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/fr/
 2017-06-14 09:15:22 +00:00
David Baker
0566e5d992 Merge pull request #1090 from matrix-org/luke/set-email-after-password-2 
Ask for email address after setting password for the first time
 2017-06-14 09:57:07 +01:00
Weblate
7ba2d19249 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 08:32:39 +00:00