Commit graph

3938 commits

Author SHA1 Message Date
David Baker
12d2480916 Reset 'first sync' flag / promise on log in
Otherwise on any logins after the first,we always think the first
sync has completed.
2017-06-06 11:36:33 +01:00
David Baker
22df03944c Merge branch 'develop' into new-guest-access 2017-06-06 10:35:28 +01:00
David Baker
f8198ba9c9 Merge branch 'develop' into new-guest-access 2017-06-06 10:33:01 +01:00
David Baker
e7af9bde23 Merge pull request #1036 from matrix-org/luke/fix-people-section-disappearing-again
Remove DM-guessing code (again)
2017-06-06 10:20:44 +01:00
Matthew Hodgson
ed7c138d91 quick and dirty override to disable MD globally 2017-06-05 21:38:25 +01:00
Matthew Hodgson
d77a09adba quick and dirty override to disable MD globally 2017-06-05 21:33:01 +01:00
David Baker
a99f6525c9 Merge pull request #1039 from matrix-org/dbkr/ilag_cancel_action
Cancel deferred actions
2017-06-05 21:27:13 +01:00
Luke Barnard
4ab6dc9ddd Merge branch 'new-guest-access' into luke/ilag-i18n 2017-06-05 20:28:51 +01:00
David Baker
f6cfff9098 Cancel deferred actions
if the set mxid dialog is canceled
2017-06-05 18:37:38 +01:00
David Baker
3553aea5df Merge pull request #1038 from matrix-org/dbkr/ilag_defer_create_room
Defer an intention for creating a room
2017-06-05 17:52:57 +01:00
David Baker
5924654f9d Defer an intention for creating a room 2017-06-05 17:45:01 +01:00
Luke Barnard
c690acc638 Add missing command 2017-06-05 17:40:21 +01:00
David Baker
ad87e9bd50 Apply 9cae667c06 to ilag branch 2017-06-05 17:28:36 +01:00
Luke Barnard
cc8078837d Remove DM-guessing code (again)
Seems this got reverted somehow:
>the revert of https://github.com/matrix-org/matrix-react-sdk/pull/807 (ebfafb3639) also included the revert of https://github.com/matrix-org/matrix-react-sdk/pull/829
2017-06-05 16:57:30 +01:00
David Baker
3dbea45426 Comment 2017-06-05 16:50:00 +01:00
David Baker
3c0290588c Always show the spinner during the first sync
Before, we were relying on the fact that `ready` would still have
been false from before. This was not the case, for example, if we
naviagted straight to /#/login (which causes a guest session to be
set up and the sync for that completes after we navigate to the
login screen).

We should always mark ourselves as not-ready after login since we
will always have to wait for the sync.
2017-06-05 16:17:32 +01:00
Luke Barnard
9f6ab4a31b Add en_EN i18n strings for setMxIdDialog 2017-06-05 16:12:00 +01:00
Luke Barnard
619830617a Merge branch 'develop' into luke/ilag-i18n
In order to get ILAG internationalised

Conflicts:
	src/components/structures/LoggedInView.js
	src/components/structures/MatrixChat.js
	src/components/views/dialogs/ChatCreateOrReuseDialog.js
	src/components/views/dialogs/SetDisplayNameDialog.js
	src/createRoom.js
	src/i18n/strings/en_EN.json
2017-06-05 16:08:03 +01:00
David Baker
c5cd6aecd6 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-05 15:54:44 +01:00
Luke Barnard
6125395675 _t for SetMxIdDialog 2017-06-05 15:36:10 +01:00
David Baker
85aa3f6f13 Merge pull request #1032 from matrix-org/luke/fix-welcome-user-background
Only view welcome user if we are not looking at a room
2017-06-05 14:38:55 +01:00
RiotTranslate
36218093fc Update from Weblate. (#1030)
* Added translation using Weblate (Thai)

* Translated using Weblate (Thai)

Currently translated at 2.6% (22 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-05 14:31:09 +01:00
David Baker
d8e3423060 Merge pull request #1031 from matrix-org/luke/fix-deferred-start-chat-settings
Keep deferred actions for view_user_settings and view_create_chat
2017-06-05 14:10:29 +01:00
Luke Barnard
c82e79ab5f Only view welcome user if we are not looking at a room 2017-06-05 14:07:24 +01:00
Luke Barnard
3195b9f964 Keep deferred actions for view_user_settings and view_create_chat
This will bring up the correct UI as intended instead of defaulting to the home page with welcome user in the room list.

Fixes https://github.com/vector-im/riot-web/issues/4162
2017-06-05 13:41:52 +01:00
Luke Barnard
beafb68538 Don't do a deferred start chat if user is welcome user
There's no point in deferring creating a new DM with the welcome user because the setMxId dialog will do so anyway.
2017-06-05 13:14:55 +01:00
Luke Barnard
239874ccce Introduce state peekLoading to avoid collision with roomLoading
The room loading spinner will now be displayed if the alias is being resolved (roomLoading) or if the peek is being loaded for the room `peekLoading`.
2017-06-05 09:52:39 +01:00
RiotTranslate
486a5bb5f2 Update from Weblate. (#1026)
* Translated using Weblate (Chinese (Traditional))

Currently translated at 43.8% (363 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 (Greek)

Currently translated at 23.2% (192 of 827 strings)

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

* Translated using Weblate (Russian)

Currently translated at 76.5% (633 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.3% (201 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.5% (203 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 31.8% (263 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 37.1% (307 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 99.8% (826 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 (Greek)

Currently translated at 46.3% (383 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 99.8% (826 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 (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Added translation using Weblate (English (United States))

* Translated using Weblate (English (United States))

Currently translated at 8.8% (73 of 827 strings)

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

* Translated using Weblate (English (United States))

Currently translated at 32.1% (266 of 827 strings)

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

* Translated using Weblate (English (United States))

Currently translated at 32.4% (268 of 827 strings)

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

* Translated using Weblate (English (United States))

Currently translated at 33.2% (275 of 827 strings)

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

* Translated using Weblate (English (United States))

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/en_US/

* Translated using Weblate (German)

Currently translated at 99.8% (826 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-04 22:54:38 +01:00
RiotTranslate
32f7cdaab6 Update from Weblate. (#1024)
* Translated using Weblate (Chinese (Traditional))

Currently translated at 43.8% (363 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 (Greek)

Currently translated at 23.2% (192 of 827 strings)

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

* Translated using Weblate (Russian)

Currently translated at 76.5% (633 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.3% (201 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.5% (203 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 31.8% (263 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 37.1% (307 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 99.8% (826 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 (Greek)

Currently translated at 46.3% (383 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 99.8% (826 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 (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Added translation using Weblate (English (United States))

* Translated using Weblate (English (United States))

Currently translated at 8.8% (73 of 827 strings)

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

* Translated using Weblate (English (United States))

Currently translated at 32.1% (266 of 827 strings)

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

* Translated using Weblate (English (United States))

Currently translated at 32.4% (268 of 827 strings)

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

* Translated using Weblate (English (United States))

Currently translated at 33.2% (275 of 827 strings)

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

* Translated using Weblate (English (United States))

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/en_US/
2017-06-04 01:16:24 +01:00
RiotTranslate
06f1f789e1 Update from Weblate. (#1023)
* Translated using Weblate (Chinese (Traditional))

Currently translated at 43.8% (363 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 (Greek)

Currently translated at 23.2% (192 of 827 strings)

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

* Translated using Weblate (Russian)

Currently translated at 76.5% (633 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.3% (201 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.5% (203 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 31.8% (263 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 37.1% (307 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 99.8% (826 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 (Greek)

Currently translated at 46.3% (383 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 99.8% (826 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-03 21:51:03 +01:00
RiotTranslate
e3bf990e66 Update from Weblate. (#1020)
* Translated using Weblate (Chinese (Traditional))

Currently translated at 43.8% (363 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 (Greek)

Currently translated at 23.2% (192 of 827 strings)

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

* Translated using Weblate (Russian)

Currently translated at 76.5% (633 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.3% (201 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.5% (203 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 31.8% (263 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 37.1% (307 of 827 strings)

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

* Translated using Weblate (German)

Currently translated at 99.8% (826 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 (Greek)

Currently translated at 46.3% (383 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/el/
2017-06-03 21:39:24 +01:00
Michael Telatynski
3411fabf12 strip most of the actual file path in the redacted url (#1022)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 21:26:22 +01:00
saul.kredi@krutt.org
159a920dc8 Better RTL support 2017-06-03 18:52:45 +03:00
Michael Telatynski
1bbdb6c985 actually pass ev through
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:51:20 +01:00
Matthew Hodgson
a9d516e8ea fix toAction i18n thinkos 2017-06-03 12:48:41 +01:00
RiotTranslate
9fdb3df9d8 Update from Weblate. (#1017)
* Translated using Weblate (Chinese (Traditional))

Currently translated at 43.8% (363 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 (Greek)

Currently translated at 23.2% (192 of 827 strings)

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

* Translated using Weblate (Russian)

Currently translated at 76.5% (633 of 827 strings)

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

* Translated using Weblate (Portuguese)

Currently translated at 99.8% (826 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.3% (201 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 24.5% (203 of 827 strings)

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

* Translated using Weblate (Greek)

Currently translated at 31.8% (263 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/el/
2017-06-03 12:43:43 +01:00
Vladi
1ff8a9ac76 Translated using Weblate (Russian)
Currently translated at 76.5% (633 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-02 21:58:14 +00:00
Bamstam
2f5d4e79d7 Translated using Weblate (German)
Currently translated at 99.8% (826 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 21:58:13 +00:00
mujx
b934127508 Added translation using Weblate (Greek) 2017-06-02 21:58:11 +00:00
RiotTranslate
541d1e00c4 Merge remote-tracking branch 'origin/develop' into develop 2017-06-02 21:05:15 +00:00
Max Sandholm
dd78ae63b2 Translated using Weblate (Swedish)
Currently translated at 21.5% (178 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 21:05:14 +00:00
Vladi
357dd7ca19 Translated using Weblate (Russian)
Currently translated at 75.9% (628 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-02 21:05:14 +00:00
Rob van den Berg
1e679d3db2 Translated using Weblate (Dutch)
Currently translated at 24.1% (200 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/nl/
2017-06-02 21:05:13 +00:00
jx tsai
9db2805443 Translated using Weblate (Chinese (Traditional))
Currently translated at 42.8% (354 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 21:05:13 +00:00
zzottel
fc97518ce9 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 21:05:11 +00: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
Michael Telatynski
4032a820f0 move KEY_M to KeyCode
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:46:08 +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
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
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
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
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
Luke Barnard
defecb1b14 Implement /user/@userid:domain?action=chat
This is a URL that can be used to start a chat with a user.
 - If the user is a guest, setMxId dialog will appear before anything and a defered action will cause `ChatCreateOrReuseDialog` to appear once they've logged in.
 - If the user is registered, they will not see the setMxId dialog.

fixes https://github.com/vector-im/riot-web/issues/4034
2017-06-02 11:36:18 +01:00
Bamstam
c9e8dd7352 Translated using Weblate (German)
Currently translated at 95.6% (771 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:33:02 +00:00
Bamstam
11b7b78162 Translated using Weblate (German)
Currently translated at 95.6% (771 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:32:50 +00:00
Bamstam
79f03eb957 Translated using Weblate (German)
Currently translated at 95.6% (771 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:32:39 +00:00
Bamstam
ce1b117e49 Translated using Weblate (German)
Currently translated at 95.6% (771 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:32:26 +00:00
RiotTranslate
4527d808f1 Merge remote-tracking branch 'origin/develop' into develop 2017-06-02 10:29:22 +00:00
Bamstam
527c596182 Translated using Weblate (German)
Currently translated at 95.6% (771 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:29:22 +00: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