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
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
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
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
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
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
David Baker
f52035f3cd
Set state from dispatch payload unconditionally
...
As apparently doing it confitionally is bad
2017-06-02 13:41:41 +01: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
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
Luke Barnard
be7c2612e8
Merge pull request #967 from matrix-org/luke/show-people-rooms-tooltips
...
Show People/Rooms emptySubListTip even when total rooms !== 0
2017-06-02 11:10:48 +01:00
David Baker
d81160d52f
Merge pull request #995 from matrix-org/luke/new-guest-access-fix-wrong-room-shown
...
Fix to show the correct room
2017-06-02 09:50:50 +01:00
Luke Barnard
7808994b71
Modify RVS test to wait until room loaded
...
This allows for the alias resolution to occur before a join is attempted. In theory, join_room could in future do an optional view_room-esque thing before attemping a join which would be less fragile than dispatching things in the right order.
Also, make sure the store indicates that it is not loading when a room ID has been used - no alias resolution need take place.
2017-06-02 09:22:48 +01:00
Luke Barnard
16c4c14a16
Fix to show the correct room
2017-06-01 18:01:30 +01:00
Luke Barnard
dd48b3f055
Add comment
2017-06-01 10:08:02 +01:00
Luke Barnard
8192374481
Add missing _t import
2017-05-31 16:02:42 +01:00
Luke Barnard
7abaadddde
Merge pull request #977 from matrix-org/luke/session-store-null-on-logout
...
Remove cachedPassword from localStorage on_logged_out
2017-05-31 16:00:24 +01:00
Luke Barnard
b3a862c2c2
Remove redundant reset
2017-05-31 15:32:55 +01:00
Luke Barnard
d0e270bd1c
Only re-render LoggedInView if MatrixClientPeg.get() is truthy
2017-05-31 15:15:27 +01:00
Luke Barnard
d83f18ab46
Remove cachedPassword from localStorage on_logged_out
...
Fixes https://github.com/vector-im/riot-web/issues/4101
2017-05-31 10:03:16 +01:00
Matthew Hodgson
c15568e003
remove spurious string
2017-05-30 21:05:26 +01:00
Matthew Hodgson
e30e45a82c
Merge branch 'develop' into new-guest-access
2017-05-30 21:05:07 +01:00
Matthew Hodgson
48a2ad93da
fix {integrationsUrl} thinko
2017-05-30 20:32:12 +01:00
Matthew Hodgson
d74de136d6
Merge pull request #970 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-30 20:18:55 +01:00
Matthew Hodgson
a9d2a950a8
Merge pull request #971 from turt2live/travis/12hr-hotfixes
...
Support 12hr time in full date
2017-05-30 20:15:39 +01:00
turt2live
583fdfbb9f
Support 12hr time in full date
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-30 13:12:27 -06:00
Bamstam
4228b23913
Translated using Weblate (German)
...
Currently translated at 100.0% (765 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 18:58:37 +00:00
dtygel
e97a48d224
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 90.8% (695 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-05-30 18:42:53 +00:00
dtygel
0b23858ae7
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 89.6% (686 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-05-30 18:27:14 +00:00
Bamstam
e0ba5f0e1a
Translated using Weblate (German)
...
Currently translated at 99.8% (764 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 18:27:13 +00:00
Amandine
9f5f351d22
Translated using Weblate (French)
...
Currently translated at 91.6% (701 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 18:27:13 +00:00
RiotTranslate
5b31390435
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 17:16:36 +00:00
Krombel
1f8dea6346
Translated using Weblate (German)
...
Currently translated at 99.8% (764 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 17:16:36 +00:00
Amandine
63e9a22168
Translated using Weblate (French)
...
Currently translated at 88.7% (679 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 17:16:36 +00:00
Matthew Hodgson
5781275392
Merge pull request #968 from matrix-org/kegan/translation-mcguffin
...
Add _tJsx()
2017-05-30 18:13:27 +01:00
RiotTranslate
bf406bfcf6
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 17:10:00 +00:00
RiotTranslate
3261f5777a
Update from Weblate. ( #966 )
...
* Translated using Weblate (German)
Currently translated at 95.4% (727 of 762 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 96.5% (736 of 762 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 96.3% (737 of 765 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 97.9% (749 of 765 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 98.0% (750 of 765 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 98.1% (751 of 765 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 99.2% (759 of 765 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 99.3% (760 of 765 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 99.4% (761 of 765 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 99.6% (762 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 18:09:17 +01:00
Krombel
b6f831559e
Translated using Weblate (German)
...
Currently translated at 99.6% (762 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 17:04:27 +00:00