mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 14:51:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
5727 commits 219 branches 562 tags 474 MiB
Commit graph

5727 commits

This branch
This branch
All branches
Author SHA1 Message Date
Szimszon
da2cca539f Translated using Weblate (Hungarian) 
Currently translated at 0.1% (1 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
 2017-06-06 11:42:28 +00:00
Bitti
ccafdfd7d3 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-06 11:42:25 +00:00
Oliver Hunt
dd6171a39e Review changes 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-06-06 12:34:03 +01:00
Oliver Hunt
a640e943f7 Added button that copies code to clipboard 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-06-06 12:33:44 +01:00
David Baker
9c30de0eaa Merge pull request #1041 from matrix-org/dbkr/reset_first_sync_promise 
Reset 'first sync' flag / promise on log in
 2017-06-06 11:43:28 +01:00
David Baker
c27f50207d comment 2017-06-06 11:43:07 +01:00
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
ad74075346 Merge pull request #1034 from matrix-org/luke/ilag-i18n 
Merge develop, add i18n for SetMxIdDialog
 2017-06-05 20:30:01 +01:00
Luke Barnard
4ab6dc9ddd Merge branch 'new-guest-access' into luke/ilag-i18n 2017-06-05 20:28:51 +01:00
Pitchaya Boonsarngsuk
4e0989b077 Translated using Weblate (Thai) 
Currently translated at 9.7% (81 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 17:47:46 +00:00
Max Sandholm
86ca384bc4 Translated using Weblate (Swedish) 
Currently translated at 35.4% (293 of 827 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/sv/
 2017-06-05 17:47:46 +00:00
Bamstam
6ba1c01ff7 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-05 17:47:42 +00:00
David Baker
f6cfff9098 Cancel deferred actions 
if the set mxid dialog is canceled
 2017-06-05 18:37:38 +01:00
Richard Lewis
dc4f321707 Pass room and user id to apps draw 2017-06-05 18:21:31 +01:00
Richard van der Hoff
32e3ea0601 Address review comments 2017-06-05 17:58:11 +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
Luke Barnard
2030c1882f Merge pull request #1037 from matrix-org/dbkr/fix_create_room_button_ilag 
Fix 'create room' button
 2017-06-05 17:35:55 +01:00
David Baker
ad87e9bd50 Apply 9cae667c06 to ilag branch 2017-06-05 17:28:36 +01:00
Richard van der Hoff
7a9784fd6e KeyRequestHandler: clear redundant users/devices on cancellations 
... otherwise _processNextRequest will get confused
 2017-06-05 17:26:25 +01:00
Erik Johnston
998a55a590 Add basic group view 2017-06-05 17:10:08 +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
015cac9a9e Merge pull request #1033 from matrix-org/dbkr/always_show_spinner_during_first_sync 
Always show the spinner during the first sync
 2017-06-05 16:56:31 +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
BrianMwit
595f69b0ca Translated using Weblate (Thai) 
Currently translated at 8.9% (74 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 15:07:30 +00: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
BrianMwit
8db7ce879a 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 12:52:20 +00:00
David Baker
cdd8cc41e2 Merge pull request #1029 from matrix-org/luke/fix-multi-welcome-user 
Don't do a deferred start chat if user is welcome user
 2017-06-05 13:45:01 +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
BrianMwit
b8c4f906bb Added translation using Weblate (Thai) 2017-06-05 12:41:21 +00: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
d72db5df87 Merge pull request #1028 from matrix-org/luke/fix-room-change-peek-spinner 
Introduce state `peekLoading` to avoid collision with `roomLoading`
 2017-06-05 10:02:45 +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
Richard Lewis
c6991fd33c Periodically pass messages to embedded iframe 2017-06-04 23:00:52 +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