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

5778 commits

This branch
This branch
All branches
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
Matthew Hodgson
869329e78a fix broken i18n 2017-06-19 11:23:52 +01:00
Matthew Hodgson
217f44900c fix broken vars 2017-06-19 11:23:43 +01:00
Matthew Hodgson
8f19400cc0 Merge pull request #1114 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-19 11:23:33 +01: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
Luke Barnard
467c195d4f 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-19 11:22:55 +01:00
Michael Telatynski
27f38aeba7 make forward_message be friendly with the RVS stuffs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-19 11:15:17 +01:00
Richard van der Hoff
ac269e6392 Merge pull request #1115 from matrix-org/rav/fix_registration_race 
Fix race in registration for pusher config
 2017-06-19 10:56:56 +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
bccf398ab5 Merge pull request #1112 from matrix-org/t3chguy/fix_forwarding 
make forward_event be friendly with the RVS stuffs
 2017-06-19 01:53:44 +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
Matthew Hodgson
6e97f98a8a Merge pull request #1114 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-18 23:49:57 +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
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
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