mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 21:51:44 +03:00
Code Issues Projects Releases Packages Wiki Activity
6005 commits 219 branches 562 tags 474 MiB
Commit graph

6005 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Baker
e1b9337bbc Merge pull request #1111 from matrix-org/dbkr/remove_collapse_rhs 
Remove unused collapse_rhs
 2017-06-16 16:51:48 +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
8e8af5eb5c Merge branch 'dbkr/remove_collapse_rhs' into erikj/group_server 2017-06-16 15:59:18 +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
Michael Telatynski
8c333dc3f7 remove debug and add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 14:39:31 +01:00
David Baker
236cf1efb2 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-16 14:19:54 +01:00
David Baker
12ad9a2c58 v0.9.5-rc.2 2017-06-16 13:28:49 +01:00
David Baker
5f42eb73c1 Prepare changelog for v0.9.5-rc.2 2017-06-16 13:28:48 +01:00
David Baker
f2bcf4d5f2 Merge remote-tracking branch 'origin/develop' into release-v0.9.5 2017-06-16 13:27:30 +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
David Baker
131e3ae68f Merge pull request #1101 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-16 12:57:56 +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
David Baker
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
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
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
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
56eb71d19f Merge pull request #1105 from matrix-org/dbkr/fix_url_previews 
Fix URL previews
 2017-06-16 09:34:41 +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
Michael Telatynski
f0f721aa32 make hiding redactions use new pattern 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:22:38 +01:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
c53fb08453 pass user settings from above 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 20:02:17 +01:00
Michael Telatynski
4b34a2b169 modernize imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-15 19:57:48 +01:00
Michael Telatynski
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
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