Commit graph

5217 commits

Author SHA1 Message Date
Brendan Abolivier
6bb22b618b Translated using Weblate (French)
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-19 17:04:10 +00:00
Brendan Abolivier
09de50a80a Translated using Weblate (French)
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-19 16:59:53 +00:00
Weblate
1ba8acc095 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 16:53:10 +00:00
GrigRUSS
321236568b 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 16:53:10 +00:00
IMIN
b4e19d533c Translated using Weblate (Korean)
Currently translated at 73.0% (662 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-19 16:53:10 +00:00
Szimszon
fedbe00f45 Translated using Weblate (Hungarian)
Currently translated at 60.2% (546 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-19 16:53:10 +00:00
Bamstam
5151d24731 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 16:53:10 +00:00
David Baker
fb0767eb5d Merge pull request #1121 from coletivoEITA/develop
add two strings to translation
2017-06-19 17:25:21 +01:00
daniel tygel
13c12811e7 typo 2017-06-19 13:22:23 -03:00
daniel tygel
aebe4fb88f add two strings to translation 2017-06-19 13:21:23 -03:00
daniel tygel
c418076c32 add two strings to translation 2017-06-19 13:20:16 -03:00
David Baker
92cb394bac Merge pull request #1120 from matrix-org/dbkr/infinite_spinner_email_reg
Fix infinite spinner on email registration
2017-06-19 16:53:01 +01:00
David Baker
640b7a74a2 Remove unnecessary if 2017-06-19 16:45:40 +01:00
David Baker
02da6fdbd5 Fix infinite spinner on email registration
Remove setTimeout on dialog display as it's no longer necessary
and causes races.
2017-06-19 16:40:33 +01:00
Weblate
49d6575c91 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 14:41:19 +00:00
Nathan van Beelen
27652e7e6e Translated using Weblate (Dutch)
Currently translated at 55.8% (506 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 14:41:19 +00:00
Richard van der Hoff
3a6dabdc08 Merge pull request #1116 from matrix-org/rav/no_more_guestcreds
Get rid of guestCreds
2017-06-19 14:34:12 +01:00
russian
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
daniel tygel
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
Luke Barnard
57f01b83be Revert "Save scroll state immediately before updating"
This reverts commit 4124a8dcff from PR https://github.com/matrix-org/matrix-react-sdk/pull/1076
2017-06-19 13:19:17 +01:00
David Baker
55288ce9f2 Merge branch 'master' into develop 2017-06-19 13:10:19 +01:00
David Baker
66c3a6d9ca v0.9.5 2017-06-19 13:09:41 +01:00
David Baker
096805a897 Prepare changelog for v0.9.5 2017-06-19 13:09:41 +01:00
David Baker
faeb40bc0f Released js-sdk v0.7.12 2017-06-19 12:00:53 +01:00
David Baker
11e0364505 Merge pull request #1117 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-19 11:28:23 +01:00
David Baker
50aefd3285 Merge pull request #1117 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-19 11:27:48 +01:00
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