Commit graph

5511 commits

Author SHA1 Message Date
Weblate
640b65eb6c Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 17:14:45 +00:00
David Baker
d5a7ef525f Translated using Weblate (Russian)
Currently translated at 99.7% (905 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-19 17:14:41 +00:00
Szimszon
f437784807 Translated using Weblate (Hungarian)
Currently translated at 62.0% (563 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-19 17:14:41 +00:00
David Baker
cb78336cb2 Merge pull request #1122 from matrix-org/dbkr/i18n_droptargets
Internationalise the drop targets
2017-06-19 18:05:49 +01:00
Szimszon
5e44c72952 Translated using Weblate (Hungarian)
Currently translated at 61.5% (558 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-19 17:04:10 +00:00
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
b1ca83bb9d Internationalise the drop targets
Unsure how these had got missed (and yet still had the translation
strings in the json)
2017-06-19 17:49:22 +01: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
26cb1404c2 Remove unnecessary if 2017-06-19 16:56:27 +01:00
David Baker
a8165d1707 Fix infinite spinner on email registration
Remove setTimeout on dialog display as it's no longer necessary
and causes races.
2017-06-19 16:56:20 +01: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
Richard Lewis
59f6448b3e Merge branch 'kegan/postmessage-widgets' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps 2017-06-19 16:00:12 +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
Luke Barnard
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
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
Richard Lewis
80c5a58fc3 Fix custom widget form styling 2017-06-19 12:06:16 +01:00
David Baker
faeb40bc0f Released js-sdk v0.7.12 2017-06-19 12:00:53 +01:00
Richard Lewis
f676b58c00 Add google ardboard logo 2017-06-19 11:47:03 +01:00
Richard Lewis
9d89bfe264 Fix jitsi logo references 2017-06-19 11:36:15 +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