Commit graph

4433 commits

Author SHA1 Message Date
Richard van der Hoff
d5bc24d9f7 Initial implementation of KeyRequestHandler, KeyShareDialog etc 2017-06-01 18:40:04 +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
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
turt2live
ab1e277f5f Support 12hr time on DateSeparator
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-01 09:53:24 -06: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
Richard van der Hoff
98c4252840 Throw errors when components don't look like components (#980)
- instead of mysteriously throwing an error later on.
2017-06-01 09:26:35 +01:00
Matthew Hodgson
b1475cb309 bump js-sdk 2017-06-01 02:04:46 +01:00
Matthew Hodgson
d021598380 fix typo 2017-06-01 02:04:43 +01:00
Matthew Hodgson
3d91b31637 i18n invited, and delete stale warning 2017-06-01 01:29:07 +01:00
Matthew Hodgson
5e3af22c5d fix broken i18n variable 2017-06-01 01:18:46 +01:00
Matthew Hodgson
b4284cf000 fix up Can't connect to HS i18n with _tJsx 2017-06-01 01:17:39 +01:00
RiotTranslate
ad0cbdd4ff Update from Weblate. (#981)
* Translated using Weblate (French)

Currently translated at 99.3% (763 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (German)

Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (French)

Currently translated at 100.0% (770 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 26.8% (207 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hans/

* Translated using Weblate (French)

Currently translated at 100.0% (770 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (German)

Currently translated at 99.7% (768 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-01 00:39:21 +01:00
Matthew Hodgson
cad2f643ea Merge pull request #982 from turt2live/travis/presence-undefined
Fix rare case where presence duration is undefined
2017-06-01 00:38:50 +01:00
Matthew Hodgson
a33b60d3a1 Merge pull request #985 from matrix-org/t3chguy/electron_flash
add concept of platform handling loudNotifications (bings/pings/whatHaveYou)
2017-06-01 00:08:46 +01:00
Michael Telatynski
8cfa3bc235 add concept of platform handling loudNotifications (bings/pings/whatHaveYou)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-31 23:49:55 +01:00
turt2live
165dfeccb9 Fix rare case where presence duration is undefined & i18n 2017-05-31 11:56:04 -06:00
Matthew Hodgson
92143f2dc2 Merge pull request #984 from matrix-org/rav/i18n_fixes
Fixes to i18n code
2017-05-31 18:35:46 +01:00
Richard van der Hoff
cbbed3f544 Fixes to i18n code 2017-05-31 18:31:10 +01:00
Richard van der Hoff
c3d37c1ff9 Call MatrixClient.clearStores on logout
... to make sure that we don't have any sensitive data sitting around in the
stores.
2017-05-31 18:28:21 +01:00
Richard van der Hoff
4bc252a16b delint src/Lifecycle 2017-05-31 17:28:08 +01:00
Richard van der Hoff
2d73f094ff Delint MatrixChat, again (#979)
grrr.
2017-05-31 15:09:09 +01:00
Kegsay
861cae8779 Merge pull request #978 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-05-31 14:12:38 +01:00
Kegsay
ecd58a00c6 Merge pull request #955 from Bitim/feature/rtl-languages-support
Add partial support for RTL languages
2017-05-31 14:11:24 +01:00
Kegsay
0f32923427 Merge pull request #975 from coletivoEITA/develop
Added two strings to translate
2017-05-31 14:08:49 +01:00
daniel tygel
75d2b2319d translate directly in pt_BR.json 2017-05-31 09:10:19 -03:00
daniel tygel
d4a89cc2df Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-05-31 09:09:27 -03:00
dtygel
3b7b1d6206 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-05-31 12:02:33 +00:00
RiotTranslate
b5194cfc80 Merge remote-tracking branch 'origin/develop' into develop 2017-05-31 09:55:58 +00:00
Bamstam
dbf5ec632e Translated using Weblate (German)
Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-31 09:55:53 +00:00
Jean GB
117e6b8fc3 Translated using Weblate (French)
Currently translated at 99.2% (762 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-31 09:55:52 +00:00
Luke Barnard
532198dd10 Merge pull request #976 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-05-31 09:55:23 +01:00
Kegan Dougal
1ab52652f7 Strip out sanitizeHtml stuff as it's not required
As per https://github.com/matrix-org/matrix-react-sdk/pull/968#issuecomment-304946341
2017-05-31 09:29:43 +01:00
RiotTranslate
7ef4257bc1 Merge remote-tracking branch 'origin/develop' into develop 2017-05-31 04:16:25 +00:00
Krombel
a72fe7b2f5 Translated using Weblate (German)
Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-31 04:16:24 +00:00
Amandine
0c918f242f Translated using Weblate (French)
Currently translated at 97.7% (751 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-31 04:16:24 +00:00
Matthew Hodgson
7f4bdd4b38 Merge pull request #974 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-05-31 00:39:11 +01:00
Krombel
a5fa479ac5 Translated using Weblate (German)
Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 23:37:59 +00:00
RiotTranslate
549875ba0a Merge remote-tracking branch 'origin/develop' into develop 2017-05-30 23:22:31 +00:00
Amandine
c1cdf79036 Translated using Weblate (French)
Currently translated at 98.0% (751 of 766 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 23:22:30 +00:00
Krombel
12ca5d7288 Translated using Weblate (German)
Currently translated at 100.0% (766 of 766 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 23:22:29 +00:00