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

252 commits

Author SHA1 Message Date
Michael Telatynski
2edfc3e598 remove commented out code as per review 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 15:51:31 +01:00
Michael Telatynski
cb478f1194 no idea why those got in there... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-04 15:50:52 +01:00
Michael Telatynski
74b2c86f93 tidy up UserSettings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-02 21:17:12 +01:00
Michael Telatynski
76e98d4267 improve version hyperlinking 
removed redundant v prefix (key already says version)
links to most applicable version/tag
tag-commit -> commit
commit1-commit2-commit3 -> commit1
(v)x.y.z -> tag<x.y.z>
commit -> commit

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-02 21:12:58 +01:00
Michael Telatynski
c6262d62a6 webrtc config electron 
init on LoggedInView mounting
configurable via UserSettings
new class: CallMediaHandler

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-28 18:21:22 +01:00
Matthew Hodgson
a2be764681 display err.message to user if available in error msgs 2017-04-23 01:48:27 +01:00
Matthew Hodgson
e18e965eb8 missing key attr 2017-04-22 16:26:39 +01:00
Matthew Hodgson
6c177bc617 Merge pull request #806 from t3chguy/t3chguy/show_access_token 
Show Access Token under Advanced in Settings
 2017-04-22 02:51:54 +01:00
Matthew Hodgson
ad76dd0dd1 Merge pull request #810 from t3chguy/t3chguy/settings_versions_improvements 
Link tags/commit hashes in the UserSettings version section
 2017-04-22 02:38:30 +01:00
Matthew Hodgson
872d0e0f50 Merge branch 'develop' into travis/hide-read-receipts 2017-04-22 01:36:38 +01:00
turt2live
64e416e117 Add option to not send typing notifications 
Addresses vector-im/riot-web#3220

Fix applies to both the RTE and plain editor.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-21 14:50:26 -06:00
turt2live
e4c4adc517 Add option to hide other people's read receipts. 
Addresses vector-im/riot-web#2526

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-21 14:28:28 -06:00
Michael Telatynski
bbd1f34336 Prepend REACT_SDK_VERSION with a v to match riot-web version output 
Add simple helper to construct version/commit hash urls
var -> let/const and prepend olmVersionString with v for same reason

for both matrix-react-sdk and riot-web, if unknown/local don't do anything
else try to create a link to the commit hash/tag name

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 03:04:34 +01:00
Michael Telatynski
61071b89df Show Access Token under Advanced in Settings 
behind a Spoiler, onClick = spoil+select

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-18 19:55:08 +01:00
David Baker
d4dc16545a Fix people section vanishing on 'clear cache' 
Stop the client first

Fixes https://github.com/vector-im/riot-web/issues/3610
 2017-04-11 18:16:29 +01:00
David Baker
811cd79206 Make the clear cache button work on desktop 
Fixes https://github.com/vector-im/riot-web/issues/3597
 2017-04-10 17:39:27 +01:00
Matthew Hodgson
6dbb4e9002 fix the warning shown to users about needing to export e2e keys 
apparently when we added the buttons to export e2e keys to the Logout button, we didn't change the text warning the user that e2e export was coming soon.  likewise when changing password and forgetting password (where we didn't even have a button to export keys)
 2017-04-07 23:34:11 +01:00
David Baker
5e3b991ec2 PR feedback fixes 2017-03-24 10:45:38 +00:00
David Baker
4cd24d15d4 Factor out AddPhoneNumber to a separate component 2017-03-22 15:18:27 +00:00
David Baker
6a37fc4325 Comment typos 2017-03-22 12:00:16 +00:00
David Baker
d5f7b3983b Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn 2017-03-21 13:44:55 +00:00
David Baker
92d5f55a46 Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display 2017-03-17 13:55:07 +00:00
David Baker
b06111202d Display threepids slightly prettier 
ie. Put a + on the front of msisdns.
 2017-03-16 15:16:24 +00:00
David Baker
af8c3edba6 Support adding phone numbers in UserSettings 2017-03-16 14:56:26 +00:00
Luke Barnard
b21f016d37 Add "Export E2E keys" option to logout dialog 
Fixes https://github.com/vector-im/riot-web/issues/3184
 2017-03-16 14:18:18 +00:00
Matthew Hodgson
3aaf37df1a beautify a tonne more errors 2017-03-12 22:59:41 +00:00
Matthew Hodgson
b7d5d2fd56 beautify UserSettings error msg 
fix up default dialog cancel button
 2017-03-12 20:03:14 +00:00
Aviral Dasgupta
32dd89774e
add support for autocomplete delay 2017-03-07 04:09:26 +05:30
Will Hunt
1995c16013 Add a user option to enable autoplaying gifs and videos. 2017-02-27 22:17:43 +00:00
Kegan Dougal
8d6c3cd3f4 Review comments 2017-02-17 15:37:49 +00:00
Kegan Dougal
0a31efa0b7 Add a 'Clear Cache' button 
This deletes the IndexedDB database and reloads the page.

This solely exists as a get-out clause for users in case the indexedDB instance
gets corrupted. Hopefully we won't ever need to point users to it.
 2017-02-17 15:16:28 +00:00
Luke Barnard
406c34b715 Make UserSettings use the right teamToken 
This threads the correct teamToken through to UserSettings for generating the referral section.
 2017-02-16 18:00:52 +00:00
Matthew Hodgson
ad2710ec5d fix CSS for import/export buttons 2017-02-09 02:00:58 +00:00
Richard van der Hoff
77f76db68b UserSettings: s/vector-web/riot-web/ 
vector is dead, long live riot
 2017-02-06 09:50:14 +00:00
Matthew Hodgson
be41462f3a merge 2017-02-02 22:05:44 +00:00
Luke Barnard
c261ca1f5e Allow base referral URL to be configurable 2017-01-31 15:17:43 +00:00
Luke Barnard
c2b0c603c0 Add referral section to user settings 
This allows those who have registered to referrer other students to Riot and have their referral counted for the campaign competition.
 2017-01-31 13:17:01 +00:00
Richard van der Hoff
67bd2cf9dd Merge branch 'matthew/warn-unknown-devices' into matthew/blacklist-unverified 2017-01-26 14:09:25 +00:00
Kegan Dougal
bea6df88e0 Move BugReportDialog to riot-web 2017-01-25 16:33:00 +00:00
Kegan Dougal
602ce37ba7 Merge branch 'develop' into kegan/rageshake-ui 2017-01-25 15:52:00 +00:00
Richard van der Hoff
ebe6cddd21 Merge remote-tracking branch 'origin/develop' into rav/megolm_backup_ui 2017-01-25 15:13:14 +00:00
Kegan Dougal
b00e090600 Do not show the bug report section if there is no bug_report_endpoint_url 2017-01-25 14:43:47 +00:00
David Baker
fc9987a827 Merge pull request #646 from matrix-org/matthew/password-reset-warning 
Warn users of E2E key loss when changing/resetting passwords or logging out
 2017-01-25 11:04:35 +00:00
Richard van der Hoff
770820e6fa Fix a bunch of lint complaints 2017-01-24 22:41:52 +00:00
Matthew Hodgson
6a40abbbf0 actually, move signout warning to UserSettings.js 
also, kill off the inexplicably useless LogoutPrompt in favour of a normal QuestionDialog.
This in turn fixes https://github.com/vector-im/riot-web/issues/2152
 2017-01-24 23:18:25 +01:00
Richard van der Hoff
b85f53cadd Implement Megolm key importing 2017-01-24 21:50:24 +00:00
Richard van der Hoff
e23deac1bb Implement e2e export 2017-01-24 21:50:24 +00:00
Richard van der Hoff
6dd46d532a Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux 2017-01-24 20:47:24 +00:00
Kegan Dougal
3b9a112136 Add bug report UI 2017-01-24 14:47:11 +00:00
Matthew Hodgson
7bc3fc8696 make UnknownDeviceDialog work again, other than the mess of vector-im/vector-web#3020 2017-01-22 01:28:43 +01:00
Matthew Hodgson
39c122fe4f fix local storage idiocy 2017-01-21 22:27:55 +01:00
Matthew Hodgson
3071fc0ddc UI for blacklisting unverified devices per-room & globally 
(written blind; untested as yet)
 2017-01-21 17:39:39 +00:00
Matthew Hodgson
937f13d578 fix a bunch of dark-theme buttons 2017-01-20 21:00:22 +00:00
David Baker
18d4d3392a Fix a bunch of linting errors 
eslint --fix and a few manual ones
 2017-01-20 14:22:27 +00:00
Matthew Hodgson
4df968ecdf fix css snafu 2017-01-18 20:06:44 +00:00
Matthew Hodgson
fc63067237 improve commentary 2017-01-18 16:36:27 +00:00
Matthew Hodgson
3d30553b7f review fixes, plus unbreak to work with new webpack layout 2017-01-18 14:06:47 +00:00
Matthew Hodgson
8288eb730c a rather hacky implementation of theme switching 2017-01-17 19:13:23 +00:00
Jani Mustonen
959163f2ef Proper accessible buttons 2017-01-13 19:36:41 +02:00
Jani Mustonen
8d79716421 Turned the links to buttons to comply with MDN's recommendations 2017-01-13 19:36:40 +02:00
Jani Mustonen
ad072cc179 Turned buttons from divs to links. Makes it possible for screen readers and hotkeys to recognize the buttons. 2017-01-13 19:36:40 +02:00
David Baker
fd44d9f4d6 Merge pull request #597 from matrix-org/dbkr/delete_threepid 
Add support for deleting threepids
 2016-12-22 15:31:34 +00:00
David Baker
a6fdbda011 Get variable name right 2016-12-22 15:26:08 +00:00
David Baker
98b22460ec They're not all emails anymore 2016-12-22 15:03:24 +00:00
David Baker
3dfffa385e Display msisdn threepids as 'Phone' 
rather than pretending only email exists
 2016-12-21 18:56:50 +00:00
David Baker
5e10ec4ece Add support for deleting threepids 2016-12-21 18:49:38 +00:00
Kegan Dougal
ec41fc284a Null guard on componentWillUnmount 2016-12-15 16:13:09 +00:00
Kegan Dougal
8a511ed54b Add .done() to catch exceptions which may be thrown in setState 2016-12-15 14:17:29 +00:00
Kegan Dougal
8f42134d9f Explain why binding 2016-12-14 16:04:20 +00:00
Kegan Dougal
13dfe9ef0f Implement bulk invite rejects 2016-12-14 16:00:50 +00:00
Kegan Dougal
1d4591ce68 Add UI in UserSettings for bulk rejecting invites 2016-12-14 15:01:50 +00:00
David Baker
6777e07a41 Remove device name from crypto section 
As it was getting it by assuming our device was the first one,
which is just not a valid assumption.
 2016-12-05 20:03:43 +00:00
David Baker
8ffe14881e Don't throw an exception entering settings page 
if end to end encryption is disabled (eg. if you're a guest and
the server is too old to support e2e for guests).
 2016-12-05 18:33:38 +00:00
Richard van der Hoff
6e6bcf8b78 Reinstate missing sections from the UserSettings 
The 'devices' and 'cryptography' sections got removed from UserSettings by #566.
 2016-11-23 11:08:21 +00:00
David Baker
857c0d1747 Wrap getAppVersion() in promise 
in case it throws
 2016-11-11 10:05:53 +00:00
David Baker
d871ca2b24 PR feedback 2016-11-08 11:43:24 +00:00
David Baker
d44adcb7a9 Fix the vector web version in UserSettings 
Add a getAppVersion() function to the platform rather than relying
on the updater code firing an event before we know what the app
version is.
 2016-11-08 10:45:19 +00:00
David Baker
d5af2d2c52 Use 'Sign In' / 'Sign Out' universally 
Rather than a mix of 'sign in/out' and 'log in/out'
 2016-09-29 17:38:52 +01:00
Matthew Hodgson
cf1b1442eb no labs for guests 2016-09-17 14:29:40 +01:00
Matthew Hodgson
736b6dac7a default labs correctly :/ 2016-09-17 00:54:56 +01:00
Matthew Hodgson
c322a191af turn on E2E and Scalar by default 2016-09-16 18:36:03 +01:00
Matthew Hodgson
67565f88fa Merge pull request #474 from matrix-org/markjh/olm_version 
Add the olm version to the settings page.
 2016-09-16 17:30:35 +01:00
Matthew Hodgson
c21309fdf6 remove stale state 2016-09-15 22:56:12 +01:00
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