Commit Graph

119 Commits (77f76db68bf047a1bbaf043ddbb622e74e9ae407)

Author SHA1 Message Date
Mark Haines c54b9c911f Add the olm version to the settings page. 2016-09-15 11:31:54 +01:00
Matthew Hodgson 8bda0bb095 basic verification UI 2016-09-15 01:55:51 +01:00
Matthew Hodgson 3b52081092 wip for collapsable RHS 2016-09-13 12:18:22 +01:00
David Baker 4b8ad3c102 Merge pull request #393 from matrix-org/dbkr/enable_labs
Add config to hide the labs section
2016-08-05 17:25:25 +01:00
David Baker 5e358b8cf6 Add comment 2016-08-05 17:18:45 +01:00
David Baker f8d02c1551 pr feedback 2016-08-05 16:36:35 +01:00
David Baker e8ee5c2f96 Add config to hide the labs section 2016-08-05 16:13:06 +01:00
Matthew Hodgson d0158f5812 fix merge conflict 2016-08-04 23:45:28 +01:00
Matthew Hodgson cf70f1731e hide integration management behind labs checkbox 2016-08-04 23:26:27 +01:00
David Baker f47ac87775 Don't show deactivate button for guests 2016-08-03 11:34:31 +01:00
David Baker 54c10a5d89 Get name of section right 2016-08-02 18:42:02 +01:00
David Baker aafec49abf WIP for deactivaing account UI
https://github.com/vector-im/vector-web/issues/1775
2016-08-02 18:40:12 +01:00
Richard van der Hoff c071bc54f9 Implement device management UI
View/rename/delete.
2016-08-01 13:42:29 +01:00
Richard van der Hoff c8df9148b3 Remove relayoutOnUpdate prop on gemini-scrollbar
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
2016-07-27 11:35:48 +01:00
David Baker fb964be072 Merge pull request #356 from matrix-org/matthew/disable-url-previews
Support for disabling/enabling URL previews per-user, per-room and per-user-per-room
2016-07-20 16:43:08 +01:00
Matthew Hodgson ebdac4ee50 first cut (untested) 2016-07-18 01:35:42 +01:00
David Baker b78340ff51 Use HS proxy API for requestToken on adding email
So we report an error if the email is already taken. Also fix a bug where the spinner wouldn't disappear if adding an email failed (and don't include the raw errcode in the user-facing dialog)
2016-07-08 17:28:04 +01:00
Richard van der Hoff f6835baa9c UserSettings: fix the displayed version of the react-sdk 2016-06-17 17:09:52 +01:00
Richard van der Hoff e973d18085 Hide e2e features if not enabled
Don't show the device info in the MemberInfo and UserSettings unless the user
has ticked the 'labs' box.
2016-06-14 11:57:08 +01:00
Aviral Dasgupta 5831a68e11 Labs improvements 2016-06-13 23:25:31 +05:30
Aviral Dasgupta 727e6daaae Fix key attr placement in UserSettings 2016-06-13 22:11:21 +05:30
Aviral Dasgupta c3a9658392 Add experimental "Labs" section to settings 2016-06-13 22:04:12 +05:30
Richard van der Hoff 1dfb3f71ae Merge branch 'develop' into rav/device_verification 2016-06-08 21:34:47 +01:00
Richard van der Hoff 086698cd11 Add device info to user settings
Requires e81ce23 from matrix-js-sdk
2016-06-08 17:02:42 +01:00
David Baker 7e8c8dd336 Remove SdkConfig
just take a config in MatrixChat, pass the individual things down through the chain.

This may become unwieldy: let's see how it goes.
2016-06-08 14:54:34 +01:00
Matthew Hodgson e20a1acb88 label our versions sensibly 2016-06-02 19:22:11 +01:00
Matthew Hodgson e1ba7df66e fix the Add button for email addies 2016-05-31 23:50:53 +01:00
Matthew Hodgson 817a3debec debug HS & IS 2016-05-18 11:42:51 +01:00
David Baker 3381e2b057 Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs 2016-04-21 10:12:27 +01:00
Richard van der Hoff d953ac4e6b Don't relayout scrollpanels every time something changes
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
2016-04-20 12:25:19 +01:00
Matthew Hodgson 19770563f4 add cancelButton to simpleHeader 2016-04-15 22:16:19 +01:00
Matthew Hodgson f625e2d693 fix up UserSettings a bit and add fading 2016-04-15 18:30:13 +01:00
David Baker fcab259511 Support for email notifs
Add utility funcs in UserSettingsStore and pass threepids to Notifications so it can do email notif stuff
2016-04-12 16:17:04 +01:00
Richard van der Hoff 1f2ba87ff5 Pass SimpleRoomHeader title in as a named property
... rather than a child
2016-03-29 23:21:17 +01:00
Richard van der Hoff 70133ae661 Factor out SimpleRoomHeader
Start cleaning up RoomHeader by factoring out a separate SimpleRoomHeader.
2016-03-29 12:51:46 +01:00
David Baker c3dd9a4b17 Unset email pending state on error or we never remove the spinner 2016-03-24 15:03:44 +00:00
David Baker f1219a6b8d Register prompt for trying to set an avatar 2016-03-22 13:50:27 +00:00
Matthew Hodgson d0d22136f5 remove totally dead wood from stale Modal API 2016-03-18 11:12:06 +00:00
Matthew Hodgson 795435b1ce DOH 2016-03-16 10:33:20 +00:00
Matthew Hodgson d8af6ec240 hide 3PID settings from guests 2016-03-15 23:57:42 +00:00
Matthew Hodgson 25bf4030de stop guests from setting avatars 2016-03-15 23:55:59 +00:00
David Baker 4da0e2fd95 Re-enable upgrade registration.
Revert https://github.com/vector-im/vector-web/issues/818 now that https://github.com/vector-im/vector-web/issues/759 is fixed.
2016-03-04 15:41:32 +00:00
David Baker 1e945cd13b Don't show the Notifications widget for guests since they can't use them (and it throws an error if you try to mount it). 2016-02-10 11:48:35 +00:00
Kegan Dougal 8b96af4ccb Display the version in UserSettings. Change MatrixChat.onNewVersion to onVersion 2016-02-03 16:51:53 +00:00
David Baker 4e4e5be9a1 Disable upgrade registration temporarily. Fixes https://github.com/vector-im/vector-web/issues/818. 2016-02-02 14:14:18 +00:00
Matthew Hodgson bc60435750 improve settings layout and fix FF bugs 2016-01-24 18:15:08 +00:00
Matthew Hodgson 442e090f37 button layout 2016-01-20 17:09:46 +00:00
Matthew Hodgson 76b7788ba6 usersettings rhs button 2016-01-20 17:07:00 +00:00
David Baker c4d4e9c46e Terminate promise chain 2016-01-19 17:20:23 +00:00
David Baker 4ed130ceac Implement adding email addresses to your profile. 2016-01-19 16:36:54 +00:00
manuroe 33edeccb43 Merge branch 'develop' into push-rules-settings
# Conflicts:
#	src/component-index.js
#	src/components/views/rooms/RoomSettings.js
2016-01-18 18:00:41 +01:00
Matthew Hodgson f476150591 fix changeavatar to avoid duplicate click on label 2016-01-15 16:33:34 +00:00
Matthew Hodgson e1e46be220 apply gemini scrollbar 2016-01-15 13:11:14 +00:00
Matthew Hodgson 828b1f4837 fix up look and feel of UserSettings a bit more 2016-01-15 12:35:30 +00:00
manuroe 953e138317 Settings page: Made the push notifications settings a separate component. This component is currently implemented at the app level 2016-01-11 17:05:27 +01:00
Kegan Dougal a3df50f4c3 Implement guest account upgrading 2016-01-07 17:23:32 +00:00
Matthew Hodgson 0772f50fab update copyright for 2016 2016-01-07 04:06:52 +00:00
Kegan Dougal 5286ec170f Wrangle CSS to get avatar in right place 2015-12-24 09:20:16 +00:00
Kegan Dougal 05d1d7c82d Better error message for failing to set avatars with no connection 2015-12-23 17:30:25 +00:00
Kegan Dougal abb170ebde Keep one source of truth (the Notifier) when toggling notification state. Fixes notifications. 2015-12-23 17:06:30 +00:00
Kegan Dougal a279dce027 Get avatar display and uploads working 2015-12-23 16:52:59 +00:00
Kegan Dougal 19bd39b066 More random tweaks
- Make onBlur reset the EditText to show that it hasn't submitted it.
- Add the user ID of the logged in user to Advanced.
- Remove remnants of the Save/Cancel buttons.
2015-12-23 16:02:18 +00:00
Kegan Dougal 72b8cf1be2 Refactor ChangePassword to get it working. Add 'Account' section because trying to make ChangePassword divs part of the same table as the display name is nigh impossible. Feels okay though 2015-12-23 15:38:28 +00:00
Kegan Dougal e657b40a7e Use ChangeDisplayName for implict display name saving on enter 2015-12-23 14:14:25 +00:00
Kegan Dougal 1af5018597 General code cleanup / tweaks / fixes
- Swap Phases enum to be using string literals
- Swap roomId prop on UserSettings for a more sane onUserSettingsClose and
  make MatrixChat responsible for swapping the room.
- s/then/done/ when terminating Promise chains to avoid subtle errors.
- Rejig render() of UserSettings so we don't need to indent quite so much.
2015-12-23 11:47:56 +00:00
Matthew Hodgson 08ffadc2c4 unbreak 2015-12-18 14:04:39 +00:00
Matthew Hodgson 4baf9d5589 Fix paths 2015-12-18 00:40:01 +00:00
Matthew Hodgson e2ae2dd199 merge stuff from vector 2015-12-18 00:37:56 +00:00
Kegan Dougal f96e7a0dc8 Add UserSettings structure 2015-11-30 15:52:41 +00:00