OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,486 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

358 Commits (6a9781f0231c532fde87f99e78ce84a5b3cfbdc2)

Author SHA1 Message Date
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
Matthew Hodgson e30e45a82c Merge branch 'develop' into new-guest-access 2017-05-30 21:05:07 +01:00
Matthew Hodgson 93a35dc07a Merge branch 'develop' into t3chguy/piwik 2017-05-30 15:58:55 +01:00
Marcel 70e7d81093 More i18n strings (#963) 
* Add i18n for E2E import and Export Dialogs

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add various previous missing i18n strings

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Translate CreateRoomButton

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ChatInviteDialog and fix missing to.

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ConfitmRedactDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeactivateAccountDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeviceVerifyDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add SessionRestoreErrorDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add SetDisplayNameDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UnknownDeviceDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add AddressTile translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeviceVerifyButtons translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add Dropdown translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UserSelector translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CaptchaForm translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CasLogin translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CustomServerDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add InteractiveAuthEntryComponents translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add LoginFooter translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add RegistrationForm translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ServerConfig translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MAudioBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MImageBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MVideoBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add TextualBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UnknownBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UrlPreviewSettings translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add AuxPanel translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add PresenceLabel translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* fix syntax error

* weird space :P

* missing ','

* fix missing value

* fix json fail

* remove acidential added file

* fix another json fail
 2017-05-30 15:09:57 +01:00
Luke Barnard 2baef643e3 Add /start to show the setMxId above HomePage 2017-05-30 14:27:02 +01:00
Michael Telatynski 7e8123e5fe move all init/enable/disable logic to Analytics/MatrixChat 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 14:26:29 +01:00
Matthew Hodgson df599890c5 add login link to SetMxIdDialog 2017-05-29 01:32:31 +01:00
Matthew Hodgson 5c885922d9 Merge branch 'develop' into new-guest-access 2017-05-28 22:58:18 +01:00
Michael Telatynski 0a1b361141 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-28 13:21:33 +01:00
Matthew Hodgson accc17a39a Merge pull request #812 from t3chguy/forward_message 
Message Forwarding
 2017-05-28 02:37:31 +01:00
Michael Telatynski 98c2f9201b initial piwik stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-27 20:47:09 +01:00
Michael Telatynski 4cd7964b58 remove window onFocus handling entirely 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-27 18:43:59 +01:00
Michael Telatynski 8e1db84bee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-focus-steal 2017-05-27 14:29:06 +01:00
Michael Telatynski 2bcb381aa7 maybe window focus should be ignored so focus is left as what it was 
but with this at least clicking on a text input will not make you
be thrown into composer instead

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-27 14:19:34 +01:00
Luke Barnard fd27d6dab1 Merge pull request #936 from matrix-org/luke/new-guest-access-need-to-set-mx-id-beore-user-settings 
Block user settings with view_set_mxid
 2017-05-26 18:48:55 +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
Luke Barnard 5e136863b0 Block user settings with view_set_mxid 2017-05-26 13:18:44 +01:00
Luke Barnard ad3373789f Warn about LifecycleStore not explicitly being used 2017-05-26 11:50:32 +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
David Baker 443ab1add7 Put back default strings on dialogs 
But make them work by calling _t in render rather than
getDefaultProps().

Also sort out some 'Warning!' strings
 2017-05-25 18:20:48 +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
David Baker 5c359e63ab Bulk change counterpart imports 
to use languageHandler wrapper func
 2017-05-25 11:39:08 +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 8fc44a9b66 Add comment to explain sync_state dispatch 2017-05-25 09:31:14 +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 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
David Baker d419c42a4f Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801 2017-05-23 15:16:31 +01:00
Luke Barnard b0a824c941 Remove double declaration of TextInputDialog 2017-05-22 16:28:23 +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
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
Michael Telatynski a2ab36f598 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:33:36 +01:00
Michael Telatynski 0e7e4d8595 replace weird sidebar snapping with better ui_opacity 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 00:20:32 +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 c6350379dc Merge pull request #881 from matrix-org/luke/user-settings-remove-current-password 
Remove "Current Password" input if mx_pass exists
 2017-05-16 12:29:23 +01:00
Luke Barnard eb0041d21a Remove redundant state 2017-05-15 17:03:54 +01:00
Luke Barnard f73cf772fb Move sessionStore ref from MatrixChat to LoggedInView 
MatrixChat didn't actually use the sessionStore, so this is one less prop to pass.
 2017-05-15 14:56:05 +01:00
Luke Barnard da3cb0ee48 SessionStore extends flux.Store 2017-05-15 14:52:19 +01:00
Luke Barnard 683f1b8a1a 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-12 17:39:38 +01:00
Luke Barnard 536724e7c5 ES6 SessionStore 2017-05-12 15:58:44 +01:00
Luke Barnard 5c8187dc8f Explicitly pass thru userHasGeneratedPassword 2017-05-12 15:47:37 +01:00
Luke Barnard 1176573f39 Implement SessionStore 
This wraps session-related state into a basic flux store. The localStorage item 'mx_pass' is the only thing managed by this store for now but it could easily be extended to track other items (like the teamToken which is passed around through props a lot)
 2017-05-12 12:02:45 +01:00
Luke Barnard 8725ef3863 Remove "Current Password" input if mx_pass exists 
If the user is PWLU, do not show "Current Password" field in ChangePassword and when setting a new password, use the cached password.
 2017-05-11 17:47:45 +01:00
Luke Barnard cfa108a28c No need to dispatch, just call setMxId 2017-05-11 17:07:03 +01:00
Luke Barnard 6326a95b39 Prevent ROUs from creating new chats/new rooms 
Spawn a SetMxIdDialog instead and do nothing.
 2017-05-11 17:04:11 +01:00
Luke Barnard 5151264f60 Merge branch 'develop' into new-guest-access 
Conflicts:
	src/component-index.js
 2017-05-11 13:22:30 +01:00
David Baker 85ed39b9d8 Put room name in 'leave room' confirmation dialog 
https://github.com/vector-im/riot-web/issues/3850
 2017-05-08 16:49:40 +01:00