Commit graph

4959 commits

Author SHA1 Message Date
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
464863acd6 remove unused imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:35:55 +01:00
Michael Telatynski
ae91f0ca62 catch ev arg so the disable stuff works
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:34:18 +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
David Baker
792f825ea9 Merge pull request #1013 from matrix-org/dbkr/fix_3pid_invite_pwlu
Fix accepting a 3pid invite
2017-06-02 16:33:13 +01:00
David Baker
2cc9f9c403 Fix accepting a 3pid invite
Fixes https://github.com/vector-im/riot-web/issues/4123
2017-06-02 16:25:14 +01:00
David Baker
ec0ad93ad7 Merge pull request #1007 from matrix-org/dbkr/propagate_room_join_errors
Propagate room join errors to the UI
2017-06-02 16:09:34 +01:00
David Baker
ac0f2f79d1 Remove redundant room_id 2017-06-02 16:02:20 +01: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
David Baker
f52035f3cd Set state from dispatch payload unconditionally
As apparently doing it confitionally is bad
2017-06-02 13:41:41 +01: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
Matthew Hodgson
57a368b8f0 Merge pull request #1003 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-02 12:29:09 +01:00
Matthew Hodgson
adfeff34ae Merge pull request #1004 from matrix-org/t3chguy/hide_redactions
allow hiding redactions, restoring old behaviour
2017-06-02 12:27:52 +01:00
Krombel
949a70e239 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:14:55 +00:00
Luke Barnard
953a573f81 Merge pull request #1006 from matrix-org/luke/new-guest-access-user-action-chat
Implement /user/@userid:domain?action=chat
2017-06-02 12:03:11 +01:00
Luke Barnard
95e38eb9c4 Remove cryptic log 2017-06-02 12:02:37 +01:00
dtygel
0b97d88766 Translated using Weblate (Portuguese (Brazil))
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/pt_BR/
2017-06-02 10:58:07 +00:00
David Baker
03f4f269ce Propagate room join errors to the UI
Dispatch so we can set the state in RoomViewStore. Show the error
when the room join fails (unsure if it's better to do this from
the component or the store). Remove unused joinError from roomview.
2017-06-02 11:53:10 +01:00
Luke Barnard
6e84b6e996 Display profile errors better 2017-06-02 11:50:58 +01:00
Luke Barnard
e88b52fa8f Add comment 2017-06-02 11:42:47 +01:00
Luke Barnard
6a9781f023 Remove redundant state 2017-06-02 11:41:09 +01:00