Commit graph

4596 commits

Author SHA1 Message Date
Richard Lewis
b893887707 Fix merge conflict 2017-06-12 14:52:41 +01:00
Richard Lewis
f9f924bbd6 Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps 2017-06-12 14:50:25 +01:00
Richard Lewis
a09001933a git status 2017-06-07 15:39:27 +01:00
Richard Lewis
c552f7f336 App icon styling 2017-06-07 10:55:49 +01:00
Richard Lewis
f6f660fa9a Initial app icon tiles 2017-06-06 23:45:17 +01:00
David Baker
31f1e421f2 v0.9.2 2017-06-06 17:40:30 +01:00
David Baker
5191f93432 Prepare changelog for v0.9.2 2017-06-06 17:40:30 +01:00
David Baker
00ccf4bb51 Revert "Call MatrixClient.clearStores on logout"
This reverts commit c3d37c1ff9.

This commit was introducing a bug where no rooms would be shown if
you want straight to /#/login and logged in (because this causes
a guest session to be created but the indexeddb store not to be
cleared, so the new login picks up the stale indexedb sync data.
2017-06-06 17:33:50 +01:00
David Baker
df6940c5f3 Merge pull request #1044 from matrix-org/luke/fix-password-recovery-landing
Hotfix: Allow password reset when logged in
2017-06-06 17:27:09 +01:00
Luke Barnard
205fd1fad4 Allow password reset when logged in 2017-06-06 17:22:49 +01:00
Richard Lewis
e8353edb06 Disable test postmessag 2017-06-06 15:57:40 +01:00
Richard Lewis
e9f110a4c5 Don't show add widget if there are more than one existing widgets 2017-06-06 14:50:43 +01:00
Richard Lewis
dc4f321707 Pass room and user id to apps draw 2017-06-05 18:21:31 +01:00
Richard Lewis
c6991fd33c Periodically pass messages to embedded iframe 2017-06-04 23:00:52 +01:00
Matthew Hodgson
0d5ad06ac1 v0.9.1 2017-06-02 22:39:32 +01:00
Matthew Hodgson
19f46faf15 Prepare changelog for v0.9.1 2017-06-02 22:39:31 +01:00
Matthew Hodgson
d48258e825 Merge pull request #1012 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-02 21:59:05 +01:00
Matthew Hodgson
853427ed89 Merge pull request #1014 from matrix-org/t3chguy/random_fix_1
typo, missing import and mis-casing
2017-06-02 21:38:42 +01:00
Michael Telatynski
31d94f32f0 fix casing in other langs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:14:45 +01:00
Michael Telatynski
46441d69eb fix casing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:09:51 +01:00
Michael Telatynski
5e85723b5a fix typo and missing import
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:09:19 +01:00
Bamstam
d28bcb9814 Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 19:50:39 +00:00
dtygel
0d0b8022d2 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-02 15:40:45 +00:00
RiotTranslate
7adc203cc8 Merge remote-tracking branch 'origin/develop' into develop 2017-06-02 13:42:50 +00:00
Max Sandholm
6abcf1a9c5 Translated using Weblate (Swedish)
Currently translated at 19.8% (164 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/sv/
2017-06-02 13:42:49 +00:00
David Baker
9e0aca534c v0.9.0 2017-06-02 14:23:30 +01:00
David Baker
77f490814a Prepare changelog for v0.9.0 2017-06-02 14:23:29 +01:00
Kegan Dougal
bfb313ce9d riot-bot only if english please 2017-06-02 14:13:45 +01:00
RiotTranslate
fc99ad770c Merge remote-tracking branch 'origin/develop' into develop 2017-06-02 13:08:56 +00:00
Max Sandholm
2d68823c4d Added translation using Weblate (Swedish) 2017-06-02 13:08:54 +00:00
Matthew Hodgson
ed144be61e fix random missing french 2017-06-02 14:05:57 +01:00
RiotTranslate
7fdfcfdc68 Update from Weblate. (#1011)
* Translated using Weblate (German)

Currently translated at 100.0% (827 of 827 strings)

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

* Translated using Weblate (Chinese (Traditional))

Currently translated at 39.5% (327 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (827 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (827 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 13:56:20 +01:00
RiotTranslate
caa2421445 Update from Weblate. (#1010)
* Translated using Weblate (German)

Currently translated at 100.0% (827 of 827 strings)

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

* Translated using Weblate (Chinese (Traditional))

Currently translated at 39.5% (327 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (827 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 13:48:43 +01:00
RiotTranslate
5c4f28679f Merge remote-tracking branch 'origin/develop' into develop 2017-06-02 12:47:22 +00:00
Kegsay
bb691915b4 Merge pull request #1009 from coletivoEITA/develop
sync pt with pt_BR
2017-06-02 13:47:17 +01:00
Krombel
bd39eecac4 Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 12:47:16 +00:00
Bamstam
a6a6745f23 Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 12:42:45 +00:00
Bamstam
74b60ed811 Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 12:41:48 +00:00
RiotTranslate
82dc60fff4 Merge remote-tracking branch 'origin/develop' into develop 2017-06-02 12:41:29 +00:00
jx tsai
6fda27bf48 Translated using Weblate (Chinese (Traditional))
Currently translated at 39.5% (327 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hant/
2017-06-02 12:41:28 +00:00
Bamstam
9eece47d1c Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 12:41:25 +00:00
daniel tygel
b90d141ef2 sync pt with pt_BR 2017-06-02 09:37:18 -03:00
Matthew Hodgson
375b435dfe hide analytics settings if no piwik url 2017-06-02 13:34:01 +01:00
Matthew Hodgson
e9c326a655 Merge pull request #1008 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-02 12:45:20 +01:00
Krombel
1e448ff05f Translated using Weblate (German)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 11:44:41 +00:00
Amandine
4fd56d1868 Translated using Weblate (French)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-02 11:40:35 +00:00
RiotTranslate
bbd3c14089 Merge remote-tracking branch 'origin/develop' into develop 2017-06-02 11:36:43 +00:00
Krombel
5a41c4396e Translated using Weblate (German)
Currently translated at 100.0% (826 of 826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-02 11:36:43 +00:00
Amandine
4bbec22811 Translated using Weblate (French)
Currently translated at 99.6% (823 of 826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-02 11:36:42 +00:00
jx tsai
b26f12a115 Translated using Weblate (Chinese (Traditional))
Currently translated at 37.5% (310 of 826 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hant/
2017-06-02 11:36:42 +00:00