OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,170 Commits
222 Branches
563 Tags
443 MiB
Commit Graph

4170 Commits (0707b7440af154ff1f94173c7111d10ccdfb0199)

Author SHA1 Message Date
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
David Baker 52d3dd4de9 cd first so we checkout the right repo 2017-05-22 16:48:53 +01:00
David Baker c5a873c316 Remove depth=1 otherwise we won't find the branch 2017-05-22 16:41:43 +01:00
David Baker 77cd9d78db Use develop if no matching branch found 2017-05-22 16:34:15 +01:00
Luke Barnard b0a824c941 Remove double declaration of TextInputDialog 2017-05-22 16:28:23 +01:00
David Baker 2c462bdfb4 Add right-branch logic to travis test script 2017-05-22 16:27:41 +01:00
Luke Barnard 05aaa599cc Merge branch 'develop' into new-guest-access 
Conflicts:
	src/components/structures/MatrixChat.js
 2017-05-22 16:19:10 +01:00
David Baker e4d35881f6 Merge pull request #915 from matrix-org/luke/new-guest-access-autoFocus-new-password 
Add prop to toggle whether new password input is autoFocused
 2017-05-22 15:19:56 +01:00
Luke Barnard a1f10ff46d Add prop to toggle whether new password input is autoFocused 2017-05-22 14:46:49 +01:00
Michael Telatynski 0d70f796e2 Merge pull request #914 from matrix-org/rav/key_formatting 
Group e2e keys into blocks of 4 characters
 2017-05-22 12:14:14 +01:00
Richard van der Hoff fc08dc33c6 Group e2e keys into blocks of 4 characters 
Hopefully this will make them a bit easier to compare.
 2017-05-22 12:01:09 +01:00
Richard van der Hoff 2ba7d91869 Merge pull request #913 from matrix-org/rav/factor_out_verify 
Factor out DeviceVerifyDialog
 2017-05-22 11:38:52 +01:00
David Baker f05de44646 Merge branch 'master' into develop 2017-05-22 11:37:29 +01:00
David Baker eadd6192e8 v0.8.9 2017-05-22 11:36:56 +01:00
David Baker 545bcbdc77 Prepare changelog for v0.8.9 2017-05-22 11:36:55 +01:00
David Baker 3a0ee385b8 Released js-sdk 2017-05-22 11:35:02 +01:00
Richard van der Hoff 574b820d11 Factor out DeviceVerifyDialog 2017-05-22 11:12:36 +01:00
Richard van der Hoff 8eea8c0fd7 Merge pull request #909 from matrix-org/rav/fix_missing_page_type 
Fix 'missing page_type' error
 2017-05-19 15:22:18 +01:00
Richard van der Hoff e3dbf057fb Fix 'missing page_type' error 
LoggedInView will complain if it is instantiated without a page_type, so let's
keep showing the syncing spinner until we have one.
 2017-05-19 14:09:20 +01:00
Richard van der Hoff c61294f71c Delintify some of MatrixChat (#907) 
... it annoyed me too much.
 2017-05-19 13:53:11 +01:00