PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
4143 commits 1 branch 0 tags 338 MiB
Commit graph

4143 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
dcf2fb68ae Remove console log 2017-05-24 18:02:17 +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
Richard van der Hoff
4df51a2b0b Reskindex to a temp file, to confuse the babel watcher less (#908) 
I'm seeing a lot of instances where the babel watcher picks up a half-written src/component-index,
and generates an empty lib file - which it then doesn't update when src/component-index is updated.

Empirically, this seems to make it better.
 2017-05-19 11:44:04 +01:00
David Baker
1addd6e304 v0.8.9-rc.1 2017-05-19 10:39:14 +01:00
David Baker
4cfd04969e Prepare changelog for v0.8.9-rc.1 2017-05-19 10:39:14 +01:00
David Baker
f615bc129f Released js-sdk 2017-05-19 10:37:33 +01:00
Luke Barnard
c51f4b14ea Merge pull request #905 from matrix-org/luke/new-guest-access-set-mxid-warm-fuzzy 
Implement warm-fuzzy success dialog for SetMxIdDialog
 2017-05-19 10:08:49 +01:00
Luke Barnard
96c3bf56f8 Implement warm-fuzzy success dialog for SetMxIdDialog 2017-05-19 09:43:56 +01:00
Matthew Hodgson
19d727ab88 Merge pull request #904 from matrix-org/t3chguy/code_style 
code style update
 2017-05-18 23:20:59 +01:00
Michael Telatynski
73d68c5513 no leading lines for else,finally,catch etc 2017-05-18 23:03:34 +01:00
Michael Telatynski
2ac3371ea4 Don't suggest vars!! 2017-05-18 22:51:22 +01:00
David Baker
3e7a31ac75 Revert "fix scroll behaviour on macs with no gemini" 
This reverts commit 1347d9fa65.
 2017-05-18 19:03:51 +01:00
David Baker
726cd60127 Merge pull request #902 from matrix-org/dbkr/prevent_illegal_finddomnode 
Prevent an exception getting scroll node
 2017-05-18 17:56:29 +01:00
David Baker
8fe3fa9178 Remove debug logging 2017-05-18 17:35:22 +01:00
David Baker
01955146e9 Prevent an exception getting scroll node 
Don't try to findDOMNode before we're mounted as it makes react
angry.
 2017-05-18 17:33:32 +01:00
Luke Barnard
46242a1703 Merge pull request #901 from matrix-org/luke/improve-country-dd-5 
Fix a few remaining snags with country dd
 2017-05-18 17:23:34 +01:00
Luke Barnard
32818aff4f Simplify expression 2017-05-18 17:08:26 +01:00
Luke Barnard
ee64f4a8dd Add country prefix to country dd options 2017-05-18 17:02:19 +01:00
Luke Barnard
384f50609d Allow searching by partial prefix (/w or /wo '+') 2017-05-18 17:01:40 +01:00
Luke Barnard
a425909b76 Get rid of react key warning when no results 2017-05-18 17:01:01 +01:00
Luke Barnard
f99fa3ac1a Fixed pressing space or clicking dd input closes dd 2017-05-18 16:58:57 +01:00
Luke Barnard
90ee0c7ad9 Merge pull request #900 from matrix-org/luke/improve-country-dd-4 
Add left_aligned class to CountryDropdown
 2017-05-18 14:38:39 +01:00
Luke Barnard
2350277d29 Add left_aligned class to CountryDropdown 
This indiciates that the dd chevron should be on the left
 2017-05-18 14:03:02 +01:00
Luke Barnard
2ebd9b6290 Merge pull request #899 from matrix-org/luke/improve-country-dd-3 
Swap to new flag files (which are stored as GB.png)
 2017-05-18 13:37:28 +01:00
Luke Barnard
c991b52d2c Swap to new flag files (which are stored as GB.png) 
Requires https://github.com/vector-im/riot-web/pull/3953
 2017-05-18 11:45:23 +01:00
Luke Barnard
e38437e6ce Invite the welcome user after registration if configured 
This will shift focus to the welcome user DM.

We probably don't want to do this for teams, but I shall leave that for another PR that fixes teams WRT to new-guest-access.
 2017-05-18 11:14:56 +01:00
Luke Barnard
a44fcd6425 Merge pull request #897 from matrix-org/luke/improve-country-dd-2 
Improve phone number country dropdown for registration and login (Act. 2, Return of the Prefix)
 2017-05-17 14:29:39 +01:00
Luke Barnard
c44d7b6c44 Improve phone number country dropdown for registration and login 
This implements https://github.com/vector-im/riot-web/issues/3895
 2017-05-17 13:09:32 +01:00
David Baker
8ce6da1b16 Merge branch 'new_release_process_stable' into develop 
This reverts all PRs currently marked notready, changing develop into
a branch that should be more stable.
 2017-05-17 10:38:09 +01:00