Matthew Hodgson
ed79a3adef
Merge pull request #935 from matrix-org/luke/new-guest-access-no-barf-on-username-check-err
...
Show "Something went wrong!" when errcode undefined
2017-05-26 17:47:52 +01:00
Matthew Hodgson
44f479c38b
Merge pull request #930 from matrix-org/luke/new-guest-access-reset-stores-on-logged-out
...
Reset store state when logging out
2017-05-26 17:45:32 +01:00
Luke Barnard
ac44151e2a
Put the reset method in the right scope...
2017-05-26 17:27:31 +01:00
Luke Barnard
9311b9012a
Use the same .reset as RoomViewStore
2017-05-26 17:23:02 +01:00
Matthew Hodgson
3d688a6ada
Merge pull request #933 from matrix-org/luke/new-guest-access-set-display-name-to-useridlocalpart
...
Set the displayname to the mxid once PWLU
2017-05-26 17:17:23 +01:00
Matthew Hodgson
1c7785535f
Merge pull request #929 from matrix-org/luke/new-guest-access-fix-view-next-room
...
Fix view_next_room, view_previous_room and view_indexed_room
2017-05-26 17:09:35 +01:00
Matthew Hodgson
fbc3f83625
Merge pull request #928 from matrix-org/luke/new-guest-access-inidicate-joining-early
...
Use RVS to indicate "joining" when setting a mxid
2017-05-26 17:08:34 +01:00
Luke Barnard
9f902c1190
Merge pull request #932 from matrix-org/luke/new-guest-access-no-notif-bar-if-is-guest
...
Don't show notif nag bar if guest
2017-05-26 16:42:12 +01:00
Luke Barnard
28094a9a66
Show "Something went wrong!" when errcode undefined
2017-05-26 13:13:57 +01:00
Luke Barnard
ad3373789f
Warn about LifecycleStore not explicitly being used
2017-05-26 11:50:32 +01:00
Luke Barnard
2400efa92b
Correct LifecycleStore docs
2017-05-26 11:48:38 +01:00
Luke Barnard
c0f43a14fd
Improve comment
2017-05-26 11:47:55 +01:00
Luke Barnard
2dcc03960a
Set the displayname to the mxid once PWLU
2017-05-26 11:46:33 +01:00
Luke Barnard
b5b157a0fb
Don't show notif nag bar if guest
2017-05-26 10:34:36 +01:00
Luke Barnard
263a51938d
Reset store state when logging out
...
This prevents leaking of state that we do not want to share with the next user
2017-05-25 17:16:16 +01:00
Luke Barnard
0849b0e205
Fix view_next_room, view_previous_room and view_indexed_room
...
These must now make a dispatch to RoomViewStore instead of calling `viewRoom` directly on MatrixChat. This will call both `viewRoom` of MatrixChat _and_ the logic in RVS so there is some redundancy here. It'd be best to move as much as possible of viewRoom out to the RVS itself.
But for now, this fixes a bug that occures when leaving (the viewed room would not change).
2017-05-25 17:10:49 +01:00
Luke Barnard
91edc06441
Use RVS to indicate "joining" when setting a mxid
...
This prevents RoomView from doing any peeking whilst the join/registration is in progress, causing weirdness with TimelinePanel getPendingEventList (which throws an error if called when peeking).
2017-05-25 17:04:42 +01:00
Luke Barnard
6218a8615a
Merge pull request #927 from matrix-org/luke/new-guest-access-not-new-password
...
Show "Password" instead of "New Password"
2017-05-25 15:35:56 +01:00
Luke Barnard
11799b4c71
Show "Password" instead of "New Password" when the existing password has been cached
2017-05-25 15:27:54 +01:00
Luke Barnard
0707b7440a
Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access
2017-05-25 15:20:22 +01:00
Luke Barnard
ce17df0883
Unbreak the roomlist
2017-05-25 15:20:02 +01:00
Luke Barnard
1214b01330
Merge pull request #926 from matrix-org/luke/new-guest-access-set-mxid-warm-fuzzy-revert
...
Remove warm-fuzzy after setting mxid
2017-05-25 15:16:52 +01:00
Luke Barnard
09c5b2f3d5
Merge pull request #925 from matrix-org/luke/new-guest-access-fix-team-server-no-config
...
Allow teamServerConfig to be missing
2017-05-25 15:07:54 +01:00
Luke Barnard
2265b59287
Remove warm-fuzzy after setting mxid
2017-05-25 14:54:28 +01:00
Luke Barnard
51c8ee6db2
Allow teamServerConfig to be missing
2017-05-25 14:38:12 +01:00
David Baker
c54a24c49a
Merge pull request #923 from matrix-org/luke/remove-guest-warning-bar
...
Remove GuestWarningBar
2017-05-25 14:30:10 +01:00
David Baker
ce4e11ab65
Merge pull request #924 from matrix-org/luke/new-guest-access-left-panel
...
Make left panel better for new users (mk III)
2017-05-25 14:17:30 +01:00
Luke Barnard
7900bf1c7d
Don't show "Drop to ..." if total rooms = 0
2017-05-25 13:55:37 +01:00
Luke Barnard
3185d3ed41
Re-add bouncing/callout animation to action buttons
2017-05-25 13:54:59 +01:00
David Baker
548f319816
Remove redundant role elements
2017-05-25 12:09:08 +01:00
David Baker
5e855e6fee
Size is a string, import react
...
React gets put in by the JSX transpile
2017-05-25 12:09:01 +01:00
David Baker
9337158a47
Separate classes for the different buttons
...
Also rename RoleButton to ActionButton because it's not being
given a Role any more.
Conflicts:
src/component-index.js
cherry-picking commit 4a5821e
2017-05-25 12:08:42 +01:00
David Baker
dc2274df54
Hide empty tips if collapsed
2017-05-25 12:05:06 +01:00
David Baker
99efbbee5e
Depend on prop-types module
...
So we can start writing code compatible with new React
2017-05-25 12:04:53 +01:00
David Baker
3d3d89202e
Year
2017-05-25 12:04:36 +01:00
David Baker
a996f52ea3
Make bottom left menu buttons use RoleButton too
2017-05-25 12:04:22 +01:00
David Baker
54af06e8e1
What year is it? Who's the president?
2017-05-25 12:04:14 +01:00
David Baker
bff0577cb6
Add buttons to room sub list headers
...
Conflicts:
src/component-index.js
src/components/views/rooms/RoomList.js
cherry-picking commit ce119a6
2017-05-25 11:49:45 +01:00
David Baker
d6d9a89453
Other empty sections no longer need to be greyed
2017-05-25 11:47:21 +01:00
David Baker
5531f27435
Make the left panel more friendly to new users
...
https://github.com/vector-im/riot-web/issues/3609
Conflicts:
src/components/views/rooms/RoomList.js
cherry-picking commit f5f35e3
2017-05-25 11:24:45 +01:00
Luke Barnard
c894c83fbe
Remove GuestWarningBar
2017-05-25 11:02:48 +01:00
Luke Barnard
f3fc459875
Merge pull request #922 from matrix-org/luke/new-guest-access-default-welcome
...
Implement default welcome page and allow custom URL /w config
2017-05-25 10:08:34 +01:00
Luke Barnard
454134661e
Merge pull request #921 from matrix-org/luke/new-guest-access-room-view-store
...
Implement a store for RoomView and join the intended room after set a mxid
2017-05-25 10:07:39 +01:00
Luke Barnard
8fc44a9b66
Add comment to explain sync_state dispatch
2017-05-25 09:31:14 +01:00
Luke Barnard
fffe425730
Add non-null RoomView key
2017-05-24 18:04:04 +01:00
Luke Barnard
dcf2fb68ae
Remove console log
2017-05-24 18:02:17 +01:00
Luke Barnard
5f36f797da
Implement default welcome page and allow custom URL /w config
...
This changes the default behaviour of displaying the room directory to instead displaying the default homepage. If specified, the config "welcomePageUrl" can be used to override the default '/home.html'.
2017-05-24 17:55:36 +01:00
Luke Barnard
c96d93b0d0
Merge branch 'new-guest-access' into luke/new-guest-access-room-view-store
2017-05-24 17:28:18 +01:00
Luke Barnard
298c5e4df3
Implement a store for RoomView
...
This allows for a truely flux-y way of storing the currently viewed room, making some callbacks (like onRoomIdResolved) redundant and making sure that the currently viewed room (ID) is only stored in one place as opposed to the previous many places.
This was required for the `join_room` action which can be dispatched to join the currently viewed room.
Another change was to introduce `LifeCycleStore` which is a start at encorporating state related to the lifecycle of the app into a flux store. Currently it only contains an action which will be dispatched when the sync state has become PREPARED. This was necessary to do a deferred dispatch of `join_room` following the registration of a PWLU (PassWord-Less User).
The following actions are introduced:
- RoomViewStore:
- `view_room`: dispatch to change the currently viewed room ID
- `join_room`: dispatch to join the currently viewed room
- LifecycleStore:
- `do_after_sync_prepared`: dispatch to store an action which will be dispatched when `sync_state` is dispatched with `state = 'PREPARED'`
- MatrixChat:
- `sync_state`: dispatched when the sync state changes. Ideally there'd be a SyncStateStore that emitted an `update` upon receiving this, but for now the `LifecycleStore` will listen for `sync_state` directly.
2017-05-24 16:56:13 +01:00
Luke Barnard
867f8914e1
Merge pull request #917 from matrix-org/dbkr/use_right_riot_branch
...
Make travis test against riot-web new-guest-access
2017-05-22 16:59:17 +01:00
