Commit graph

5051 commits

Author SHA1 Message Date
David Baker
43b18db900 Merge pull request #1005 from matrix-org/kegan/translation-baboon
Add missing translations
2017-06-02 11:27:28 +01:00
Bamstam
d01cec0b7c Translated using Weblate (German)
Currently translated at 95.5% (770 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 10:18:03 +00:00
Kegan Dougal
a8ca7c899f Review comments 2017-06-02 11:16:08 +01:00
Luke Barnard
be7c2612e8 Merge pull request #967 from matrix-org/luke/show-people-rooms-tooltips
Show People/Rooms emptySubListTip even when total rooms !== 0
2017-06-02 11:10:48 +01:00
Amandine
f83c45f0c8 Translated using Weblate (French)
Currently translated at 100.0% (806 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-02 10:07:16 +00:00
Bamstam
d9632d3df5 Translated using Weblate (German)
Currently translated at 95.5% (770 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 09:56:26 +00:00
Kegan Dougal
f54c182eb1 Add remaining strings for vector-im/riot-web#4151 2017-06-02 10:47:08 +01:00
Kegan Dougal
d2e766e4f0 First round 2017-06-02 10:18:31 +01:00
David Baker
d81160d52f Merge pull request #995 from matrix-org/luke/new-guest-access-fix-wrong-room-shown
Fix to show the correct room
2017-06-02 09:50:50 +01:00
Luke Barnard
7808994b71 Modify RVS test to wait until room loaded
This allows for the alias resolution to occur before a join is attempted. In theory, join_room could in future do an optional view_room-esque thing before attemping a join which would be less fragile than dispatching things in the right order.

Also, make sure the store indicates that it is not loading when a room ID has been used - no alias resolution need take place.
2017-06-02 09:22:48 +01:00
dtygel
e18437378b Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (805 of 806 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-02 05:36:38 +00:00
Michael Telatynski
5e2e550bf9 don't lose date seperator when the first event of the new day is redacted
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 04:39:44 +01:00
Michael Telatynski
d2d0ba952a allow hiding redactions. no point onAccountData as it'd cause a full
refresh, this may need to be handled differently in the future.
Currently handling same as the new timestamp stuff

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 04:23:07 +01:00
RiotTranslate
a2b082f029 Merge remote-tracking branch 'origin/develop' into develop 2017-06-02 02:56:55 +00:00
Krombel
b753563a7e Translated using Weblate (German)
Currently translated at 97.6% (778 of 797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 02:56:54 +00:00
jx tsai
a8acffa8e1 Translated using Weblate (Chinese (Traditional))
Currently translated at 38.8% (310 of 797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hant/
2017-06-02 02:56:54 +00:00
dtygel
364e7d6ae9 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (797 of 797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-02 02:56:52 +00:00
Matthew Hodgson
8add074dbf v0.9.0-rc.2 2017-06-02 01:14:13 +01:00
Matthew Hodgson
3c5d0f82c9 Prepare changelog for v0.9.0-rc.2 2017-06-02 01:14:13 +01:00
Matthew Hodgson
adf8ce9ca1 Merge pull request #1002 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-02 01:09:11 +01:00
Matthew Hodgson
7e097d8d74 Merge branch 'release-v0.9.0-rc.1' into develop 2017-06-02 01:07:08 +01:00
Matthew Hodgson
73f97b4661 bump js-sdk for webrtc 2017-06-02 01:05:09 +01:00
Matthew Hodgson
ec433907f0 Merge pull request #850 from t3chguy/webrtc_settings
webrtc config electron
2017-06-02 00:48:25 +01:00
Michael Telatynski
b1973d7998 undefined =/= ''
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:42:19 +01:00
Michael Telatynski
f4db83a031 try empty string as falsey key
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:31:43 +01:00
Michael Telatynski
6b4daf02a9 i18 missed things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:27:20 +01:00
Michael Telatynski
0bafd6458a Revert voodoo 2017-06-02 00:26:31 +01:00
Michael Telatynski
4976cbb424 missed a thing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:21:34 +01:00
Matthew Hodgson
c7285b9053 fix fr layout 2017-06-02 00:21:00 +01:00
Michael Telatynski
46a9326607 special case default - CallMediaHandler can figure it out
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 00:20:34 +01:00
Matthew Hodgson
6a225d1ac2 use new sign-in string 2017-06-02 00:16:17 +01:00
Matthew Hodgson
b411c8f97e shorten signin label to aid fr i18n 2017-06-02 00:10:54 +01:00
Michael Telatynski
3eb519b227 this is just endless
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:54:17 +01:00
Michael Telatynski
beedeec163 copy the arrays so we're not making a mess
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:50:14 +01:00
Michael Telatynski
0f2c89d525 lets actually make things work, eh?
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:39:54 +01:00
Michael Telatynski
4e36c10c38 only unshift default if there is no deviceId===default
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:33:36 +01:00
Michael Telatynski
dd4480f8c3 change device data structure to array of objects
so that we can set falsey values, for unsetting device
                               most dolphinately needs testing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:26:43 +01:00
Michael Telatynski
aa90d6b097 fix **AMAZING** C&P derp
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 23:00:25 +01:00
Michael Telatynski
0c36778369 fix bad indentation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 22:59:37 +01:00
Michael Telatynski
dbba1dedb6 i18nize all the things and change show logic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-01 22:58:17 +01:00
Michael Telatynski
04b86e5d1d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings
and i18nize webrtc stufffs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js
2017-06-01 22:56:31 +01:00
Amandine
10095af4d9 Translated using Weblate (French)
Currently translated at 100.0% (797 of 797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-01 21:48:02 +00:00
RiotTranslate
0fa902c21d Merge remote-tracking branch 'origin/develop' into develop 2017-06-01 21:07:12 +00:00
Bamstam
0b6d20a62e Translated using Weblate (German)
Currently translated at 99.6% (778 of 781 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-01 21:07:10 +00:00
Matthew Hodgson
650d45466c fix up missing strings caused by punctuation changes 2017-06-01 22:06:02 +01:00
Matthew Hodgson
ee965a89a7 Merge pull request #986 from uhoreg/compact
enable useCompactLayout user setting an add a class when it's enabled
2017-06-01 21:32:54 +01:00
Matthew Hodgson
be3ac354ed Merge pull request #987 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-01 21:24:40 +01:00
Matthew Hodgson
6c56fa3381 Merge pull request #990 from matrix-org/kegan/translation-marmoset
Translation fixes for everything but src/components
2017-06-01 21:22:00 +01:00
Matthew Hodgson
54ae92e9fb Merge pull request #1001 from MTRNord/patch-4
Fix tests
2017-06-01 20:18:55 +01:00
Marcel
8c2728ffc5 Revert changes of the key used 2017-06-01 21:10:58 +02:00