503302fcea
Translated using Weblate (Thai)
...
Currently translated at 39.2% (325 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-06 11:42:29 +00:00
1ad9e6e6fa
Translated using Weblate (Russian)
...
Currently translated at 76.9% (636 of 827 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-06 11:42:28 +00:00
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
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
4cec4f066d
Fix #4191 : add defaults to avoid throwing ( #4195 )
2017-06-06 12:38:06 +01:00
7098ca9df0
Added styling for copy to clipboard button - currently using the edit button's image as a placeholder
...
Signed-off-by: Oliver Hunt <oliver@hunt.bz >
2017-06-06 12:37:48 +01:00
dd6171a39e
Review changes
...
Signed-off-by: Oliver Hunt <oliver@hunt.bz >
2017-06-06 12:34:03 +01:00
a640e943f7
Added button that copies code to clipboard
...
Signed-off-by: Oliver Hunt <oliver@hunt.bz >
2017-06-06 12:33:44 +01:00
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
c27f50207d
comment
2017-06-06 11:43:07 +01:00
e30fcdba4c
Merge branch 'develop' into new-guest-access
2017-06-06 11:39:47 +01:00
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
22df03944c
Merge branch 'develop' into new-guest-access
2017-06-06 10:35:28 +01:00
f8198ba9c9
Merge branch 'develop' into new-guest-access
2017-06-06 10:33:01 +01:00
ce01bcac2d
Merge pull request #4197 from RiotTranslate/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-06 10:22:45 +01:00
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
ed7c138d91
quick and dirty override to disable MD globally
2017-06-05 21:38:25 +01:00
d77a09adba
quick and dirty override to disable MD globally
2017-06-05 21:33:01 +01:00
a99f6525c9
Merge pull request #1039 from matrix-org/dbkr/ilag_cancel_action
...
Cancel deferred actions
2017-06-05 21:27:13 +01:00
88e843d992
Merge pull request #4201 from vector-im/luke/fix-tests
...
Fix tests for new-guest-access
2017-06-05 21:25:59 +01:00
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
4ab6dc9ddd
Merge branch 'new-guest-access' into luke/ilag-i18n
2017-06-05 20:28:51 +01:00
feaff9d99d
Fix tests for new-guest-access
...
This time the test wasn't being flaky, but it does inspect a lot of the internal of RoomView, which has had some modifications recently. I've updated the test to reflect this and it passes locally.
Also, fix a bug in HomePage with an undeclared "error" which should be "err".
Let's see what Travis thinks of this!
2017-06-05 20:16:44 +01:00
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
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
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
f6cfff9098
Cancel deferred actions
...
if the set mxid dialog is canceled
2017-06-05 18:37:38 +01:00
0ef800073b
App drawer styling
2017-06-05 18:21:52 +01:00
dc4f321707
Pass room and user id to apps draw
2017-06-05 18:21:31 +01:00
e8d5021b48
Translated using Weblate (Thai)
...
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-05 17:12:05 +00:00
32e3ea0601
Address review comments
2017-06-05 17:58:11 +01:00
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
5924654f9d
Defer an intention for creating a room
2017-06-05 17:45:01 +01:00
c690acc638
Add missing command
2017-06-05 17:40:21 +01:00
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
ad87e9bd50
Apply https://github.com/matrix-org/matrix-react-sdk/commit/9cae667c063e67b32e60b89e7256d714a056559b to ilag branch
2017-06-05 17:28:36 +01:00
7a9784fd6e
KeyRequestHandler: clear redundant users/devices on cancellations
...
... otherwise _processNextRequest will get confused
2017-06-05 17:26:25 +01:00
998a55a590
Add basic group view
2017-06-05 17:10:08 +01:00
5e67bcdac7
Merge pull request #4198 from vector-im/luke/ilag-i18n
...
i18n for SetPasswordDialog
2017-06-05 17:00:21 +01:00
cc8078837d
Remove DM-guessing code (again)
...
Seems this got reverted somehow:
>the revert of https://github.com/matrix-org/matrix-react-sdk/pull/807 (https://github.com/matrix-org/matrix-react-sdk/commit/ebfafb363972e77ef02f0e518573bf68ebc0ed15 ) also included the revert of https://github.com/matrix-org/matrix-react-sdk/pull/829
2017-06-05 16:57:30 +01:00
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
3dbea45426
Comment
2017-06-05 16:50:00 +01:00
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
0919b7ce3a
i18n for SetPasswordDialog
2017-06-05 16:13:44 +01:00
9f6ab4a31b
Add en_EN i18n strings for setMxIdDialog
2017-06-05 16:12:00 +01:00
95d9b85a93
Merge remote-tracking branch 'origin/develop' into develop
2017-06-05 15:09:47 +00:00
2f990bf410
Translated using Weblate (Thai)
...
Currently translated at 56.7% (92 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-05 15:09:47 +00:00
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
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
c610d21e68
enable en_US as a 1st class language
2017-06-05 16:05:07 +01:00
Pitchaya Boonsarngsuk
Vladi
Szimszon
Bitti
Kegsay
Oliver Hunt
David Baker
David Baker
Matthew Hodgson
Luke Barnard
Luke Barnard
Max Sandholm
Bamstam
Richard Lewis
Richard van der Hoff
Erik Johnston
RiotTranslate