David Baker
ccaa55d2c8
Merge pull request #1049 from matrix-org/dbkr/ilag_cancel_join_on_login
...
Cancel 'join room' action if 'log in' is clicked
2017-06-07 11:59:45 +01:00
David Baker
1dbdbc163b
Cancel 'join room' action if 'log in' is clicked
...
or 'choose different server'
We canceled the deferred action in the MatrixChat SetMxId dialog
but not the one in roomview.
Fixes https://github.com/vector-im/riot-web/issues/4217
2017-06-07 11:55:24 +01:00
Kegan Dougal
4127e7121c
Translate src/components/structures
...
Includes some pluralisation! Tested them manually to make sure they work.
2017-06-07 11:40:46 +01:00
Michael Telatynski
0a2a782d63
track the action of opt-out
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-07 11:26:52 +01:00
Michael Telatynski
bd948ef915
for riot.im instances, track location.pathname
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-07 11:25:27 +01:00
Michael Telatynski
56df54f946
hardcode logged url to riot.im/app so piwik has a base to work with, it gets confused when a CustomURL isn't actually a URL (like it wasn't after the latest redaction fixes.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-07 11:17:57 +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
Matthew Hodgson
184c2d5e58
Merge pull request #1015 from matrix-org/t3chguy/random_fix_1
...
fix copy and paste derp and rip out unused imports
2017-06-06 18:02:35 +01:00
David Baker
9f15e8e152
Merge branch 'master' into develop
2017-06-06 17:41:05 +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
RiotTranslate
71c12b0615
Update from Weblate. ( #1042 )
...
* 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/
* 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/
* 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 (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/
* 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/
* 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 (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/
* 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/
* 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/
* Translated using Weblate (German)
Currently translated at 99.8% (827 of 828 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-06 16:44:28 +01:00
Kegsay
5c1866c1c6
Add get_membership_count scalar API ( #1043 )
2017-06-06 16:41:08 +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
Kegsay
0b56d33bd2
Null guard all interpolated strings passed to _t ( #1035 )
2017-06-06 13:56:37 +01: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
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
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
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
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