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 |
Marcel
|
1b35f816fb
|
Fix languages.json
|
2017-06-01 21:10:32 +02:00 |
Marcel
|
924a8d1be0
|
Fix line change that should not happen
|
2017-06-01 21:03:43 +02:00 |
Marcel
|
51131ef7a5
|
Fix translation tests part 2
|
2017-06-01 21:02:40 +02:00 |
Marcel
|
cbf967a86d
|
Fix tests
We do not have a en.json but a en_EN.json
|
2017-06-01 20:53:59 +02:00 |
Matthew Hodgson
|
c5921c4c28
|
Merge pull request #999 from MTRNord/patch-3
Fix tests for PR #989
|
2017-06-01 19:46:55 +01:00 |
Matthew Hodgson
|
ba99036054
|
Merge pull request #1000 from matrix-org/revert-994-revert-989-add-language-picker-labels
Revert "Revert "add labels to language picker""
|
2017-06-01 19:46:44 +01:00 |
Matthew Hodgson
|
8e34b59d32
|
Revert "Revert "add labels to language picker""
|
2017-06-01 19:46:25 +01:00 |
Marcel
|
46750c4b9b
|
Fix tests for PR #989
|
2017-06-01 20:40:27 +02:00 |
Richard van der Hoff
|
d0c1da580f
|
Merge pull request #997 from matrix-org/t3chguy/external_electron
maybe fixxy [Electron] external thing?
|
2017-06-01 19:05:50 +01:00 |
Michael Telatynski
|
9f8b2ba4ba
|
maybe fixxy?
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-06-01 18:58:07 +01:00 |
David Baker
|
f756d231cf
|
Merge pull request #992 from matrix-org/rav/no_run_riot_tests_on_test_fail
travisci: Don't run the riot-web tests if the react-sdk tests fail
|
2017-06-01 18:39:33 +01:00 |
Matthew Hodgson
|
33214b8752
|
Merge pull request #991 from turt2live/travis/date-sep-12hr
Support 12hr time on DateSeparator
|
2017-06-01 18:26:13 +01:00 |
RiotTranslate
|
989e994abc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-06-01 17:10:28 +00:00 |
Bamstam
|
3ffa3d82c6
|
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 17:10:27 +00:00 |
Amandine
|
a2b931ee91
|
Translated using Weblate (French)
Currently translated at 100.0% (781 of 781 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
|
2017-06-01 17:10:25 +00:00 |
Luke Barnard
|
16c4c14a16
|
Fix to show the correct room
|
2017-06-01 18:01:30 +01:00 |
Richard van der Hoff
|
3c02b70eb7
|
Merge pull request #994 from matrix-org/revert-989-add-language-picker-labels
Revert "add labels to language picker"
|
2017-06-01 17:54:30 +01:00 |
Richard van der Hoff
|
b3e9716126
|
Revert "add labels to language picker"
|
2017-06-01 17:52:25 +01:00 |
Richard van der Hoff
|
6e693612a0
|
travisci: Don't run the riot-web tests if the react-sdk tests fail
|
2017-06-01 17:49:49 +01:00 |
Richard van der Hoff
|
53ebc8d7bd
|
Merge pull request #983 from matrix-org/rav/clear_storage_on_logout
Call MatrixClient.clearStores on logout
|
2017-06-01 17:34:21 +01:00 |
Kegan Dougal
|
66bce35918
|
copyright adjustments
|
2017-06-01 17:29:40 +01:00 |
turt2live
|
ab1e277f5f
|
Support 12hr time on DateSeparator
Signed-off-by: Travis Ralston <travpc@gmail.com>
|
2017-06-01 09:53:24 -06:00 |
Jean GB
|
312109e846
|
Translated using Weblate (French)
Currently translated at 98.7% (771 of 781 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
|
2017-06-01 15:18:38 +00:00 |
Kegan Dougal
|
0c7040e190
|
Missed one
|
2017-06-01 16:08:42 +01:00 |
Kegan Dougal
|
ced68f2719
|
Find a way to translate the name of RTE in user settings
I never said it was a *nice* way...
|
2017-06-01 15:53:08 +01:00 |
Kegan Dougal
|
a0c21854a9
|
Make it compile
|
2017-06-01 15:45:31 +01:00 |
Kegan Dougal
|
547f10bcbb
|
Add translations for slash command failures
|
2017-06-01 15:44:56 +01:00 |
RiotTranslate
|
6c48279665
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-06-01 14:31:50 +00:00 |
Jean GB
|
e266edf350
|
Translated using Weblate (French)
Currently translated at 99.1% (771 of 778 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
|
2017-06-01 14:31:50 +00:00 |
Krombel
|
5300aa40f9
|
Translated using Weblate (German)
Currently translated at 100.0% (778 of 778 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
|
2017-06-01 14:31:48 +00:00 |
Kegan Dougal
|
f75e714c3a
|
More translations..
|
2017-06-01 15:18:06 +01:00 |
Matthew Hodgson
|
ecbc724a3f
|
Merge pull request #988 from matrix-org/matthew/room-avatar-event
Matthew/room avatar event
|
2017-06-01 14:43:29 +01:00 |
Matthew Hodgson
|
e6cf93e237
|
switch to imports
|
2017-06-01 14:42:44 +01:00 |
Matthew Hodgson
|
01cdc7ff21
|
remove rogue import
|
2017-06-01 14:42:38 +01:00 |
Matthew Hodgson
|
fdb619cb40
|
Merge pull request #989 from coletivoEITA/add-language-picker-labels
add labels to language picker
|
2017-06-01 14:38:48 +01:00 |
daniel tygel
|
b8e26ddf3d
|
add labels to language picker
|
2017-06-01 09:48:36 -03:00 |
Matthew Hodgson
|
00750b4686
|
quick and dirty RoomAvatarEvent
|
2017-06-01 13:31:24 +01:00 |
Matthew Hodgson
|
d689d4e1fa
|
quick and dirty RoomAvatarEvent
|
2017-06-01 13:31:15 +01:00 |
RiotTranslate
|
8880207d36
|
[WEBLATE] fix fr and de merge issue
|
2017-06-01 12:28:16 +00:00 |