b7fb2dee83
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-19 13:24:01 +00:00
05810fa83b
Translated using Weblate (Portuguese (Brazil))
...
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/pt_BR/
2017-06-19 13:22:07 +00:00
57f01b83be
Revert "Save scroll state immediately before updating"
...
This reverts commit 4124a8dcffhttps://github.com/matrix-org/matrix-react-sdk/pull/1076
2017-06-19 13:19:17 +01:00
83d5822c85
Show a "Skip" button instead of "Cancel" in SetEmailDialog
...
Fixes https://github.com/vector-im/riot-web/issues/4309
2017-06-19 13:17:12 +01:00
80c5a58fc3
Fix custom widget form styling
2017-06-19 12:06:16 +01:00
f676b58c00
Add google ardboard logo
2017-06-19 11:47:03 +01:00
9d89bfe264
Fix jitsi logo references
2017-06-19 11:36:15 +01:00
11e0364505
Merge pull request #1117 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-06-19 11:28:23 +01:00
a2764a0c1f
Merge remote-tracking branch 'origin/develop' into develop
2017-06-19 10:25:04 +00:00
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
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
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
869329e78a
fix broken i18n
2017-06-19 11:23:52 +01:00
217f44900c
fix broken vars
2017-06-19 11:23:43 +01:00
8f19400cc0
Merge pull request #1114 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-06-19 11:23:33 +01:00
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
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
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
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
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
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
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
032650e095
Merge branch 'develop' into t3chguy/fix_forwarding
2017-06-19 01:53:35 +01:00
fac98d16dd
fix broken i18n
2017-06-19 00:11:34 +01:00
022161b78f
fix broken vars
2017-06-19 00:08:29 +01:00
5d370e47d3
Merge remote-tracking branch 'origin/develop' into develop
2017-06-18 22:43:50 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8e8af5eb5c
Merge branch 'dbkr/remove_collapse_rhs' into erikj/group_server
2017-06-16 15:59:18 +01:00
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
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
5f689b7929
Merge branch 'rav/fix_token_redirect' into rav/refactor_matrixclient_states_tmp
2017-06-16 15:20:47 +01:00
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
8c333dc3f7
remove debug and add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-16 14:39:31 +01:00
236cf1efb2
Merge remote-tracking branch 'origin/develop' into erikj/group_server
2017-06-16 14:19:54 +01:00
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
1f719b3f7d
Avoid getting stuck in a loop in CAS login
...
498ea53
2017-06-16 13:06:28 +01:00
