Commit Graph

60 Commits

Author SHA1 Message Date
J. Ryan Stinnett f04c347df7 Lift 3PID state management up to Settings tab
This pulls the 3PID state management in Settings up to a single location so that
the Account and Discovery sections now work from a single list that updates
immediately.

Fixes https://github.com/vector-im/riot-web/issues/10519
2019-09-11 16:21:42 +01:00
J. Ryan Stinnett a03b224ff7 Merge pull request #3394 from matrix-org/jryans/bound-3pids-warning
Add bound 3PID warning when changing IS as well
2019-09-09 12:28:19 +01:00
J. Ryan Stinnett c3adddb5ac Change to paragraphs outside the strings 2019-09-09 10:27:02 +01:00
J. Ryan Stinnett 3ad88604cc Stregthen bound 3PID warning dialog
This tweaks the bound 3PID text and adds danger styling.

Fixes https://github.com/vector-im/riot-web/issues/10750
2019-09-06 15:18:01 +01:00
J. Ryan Stinnett 5fddb20d86 Stop setting IS input field on account change
This stops setting a value in the IS input on account change. While it may have
been marginally useful if you have the form open and change on a different
device, it also seems to pick up changes on the current device, leading to
strange UX locally.

Fixes https://github.com/vector-im/riot-web/issues/10756
Fixes https://github.com/vector-im/riot-web/issues/10757
2019-09-06 14:33:40 +01:00
J. Ryan Stinnett 11a5fca702 Remove logs 2019-09-06 13:44:44 +01:00
J. Ryan Stinnett df03477907 Show change warning only when different from current 2019-09-06 11:54:08 +01:00
J. Ryan Stinnett 19fff51b01 Rework handling for terms CORS error
Earlier changes in this branch removed the "next step" of saving from the
dialogs, so we need to fold in the CORS error case.
2019-09-06 11:12:10 +01:00
J. Ryan Stinnett 2ff592c542 Use existing modal promises 2019-09-06 10:48:24 +01:00
J. Ryan Stinnett d5552e4a17 Add bound 3PID warning when changing IS as well
This extends the bound 3PID warning from the disconnect button to also appear
when changing the IS as well. At the moment, the text is a bit terse, but will
be improved separately.

Fixes https://github.com/vector-im/riot-web/issues/10749
2019-09-05 17:52:46 +01:00
J. Ryan Stinnett 166fb696c2 Allow connecting to an IS from address picker
This allows those who previously disconnected from an IS to either choose the
default IS or a custom one from Settings via the address picker dialog.

Part of https://github.com/vector-im/riot-web/issues/10619
2019-08-29 15:28:34 +01:00
Travis Ralston abbc8ffef0 Adjust copy and include identity server changing when terms are pending
Fixes https://github.com/vector-im/riot-web/issues/10636
Fixes https://github.com/vector-im/riot-web/issues/10635
2019-08-26 11:26:21 -06:00
Travis Ralston e8b0c41157 minus ; 2019-08-23 12:01:47 -06:00
Travis Ralston c44ae2df4d Treat 404 errors on IS as having no terms
Fixes https://github.com/vector-im/riot-web/issues/10634
2019-08-23 11:58:04 -06:00
Travis Ralston 04bb2ed322 Merge pull request #3327 from matrix-org/travis/discover-terms
Handle terms agreement in Discovery section of user settings
2019-08-21 10:14:45 -06:00
Travis Ralston 2dc28a608f Move URL abbreviation to its own util file 2019-08-21 08:46:10 -06:00
Travis Ralston f55a40001c Touch up settings: alignment, spacing, error states
Fixes https://github.com/vector-im/riot-web/issues/10554

Issues fixed:
* Fields were not ~30px from the avatar (too much right margin)
* Tooltips overflowed the dialog on some resolutions
* SetIdServer didn't have an error state for making the field red
* Spacing between sections in Discovery was wrong (fixed by just removing the problematic n+2 selector - it didn't help anything)
2019-08-20 13:20:07 -06:00
Travis Ralston 83af732d05 Rename and export abbreviateIdentityUrl 2019-08-19 22:53:37 -06:00
J. Ryan Stinnett fef3438ef1 Merge pull request #3325 from matrix-org/jryans/tweak-privacy-copy
Tweak privacy settings copy and whitespace
2019-08-19 21:35:49 +01:00
Travis Ralston 2d4c2b76d9 Merge branch 'develop' into travis/is-account-data 2019-08-19 10:36:42 -06:00
Travis Ralston 95bd41aac7 Merge pull request #3317 from matrix-org/travis/terms/inline-is-only
Prompt for terms of service on identity server changes
2019-08-19 10:35:58 -06:00
Travis Ralston 32abfbbfc6 Rename functions 2019-08-19 10:27:57 -06:00
J. Ryan Stinnett 5af9bf7b80 Use designed text for new IS field 2019-08-19 14:44:53 +01:00
J. Ryan Stinnett d4ecb99d11 Show the default IS as a placeholder in Settings
This changes the UX for the set IS field to show the default IS as a placeholder
value (as opposed to an initial value as if the user had actually entered it).

Fixes https://github.com/vector-im/riot-web/issues/10528
2019-08-19 14:20:01 +01:00
Travis Ralston 51946d2a74 Persist and maintain identity server in account data
Fixes https://github.com/vector-im/riot-web/issues/10094

MSC: https://github.com/matrix-org/matrix-doc/pull/2230
2019-08-16 13:10:41 -06:00
Travis Ralston 2456912ec7 Merge remote-tracking branch 'origin/develop' into travis/terms/inline-is-only 2019-08-16 09:41:00 -06:00
Travis Ralston 02f8b72533 tfw the linter finds bugs for you 2019-08-15 16:08:18 -06:00
Travis Ralston 9860baf0b4 Prompt for terms of service on identity server changes
Part of https://github.com/vector-im/riot-web/issues/10539
2019-08-15 16:02:02 -06:00
David Baker 7d96cc969a use original bug
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-15 15:39:15 +01:00
David Baker 6f07f9157c lint 2019-08-15 13:10:05 +01:00
David Baker 75770f7a4a Warn on disconnecting from IS
...if the user has bound threepids

Fixes https://github.com/vector-im/riot-web/issues/10550
2019-08-15 12:04:07 +01:00
David Baker c74da125b2 i18n 2019-08-14 10:12:39 +01:00
David Baker be7956db61 Spell out identity server
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-14 10:08:43 +01:00
David Baker 3c3b530e1e Spell out identity server
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-14 10:08:30 +01:00
David Baker 85497610e3 Spell out identity server
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-14 10:08:15 +01:00
David Baker 0d560108b6 Kill smart quotes
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-08-14 10:07:50 +01:00
David Baker b0420c106e Prepopulate client default on disconnect 2019-08-14 10:06:05 +01:00
David Baker 735c6d73d8 Merge remote-tracking branch 'origin/develop' into dbkr/disco_is 2019-08-14 10:03:32 +01:00
David Baker 7c35107a37 Update 3pids section visibility when id server set / unset 2019-08-13 18:40:27 +01:00
David Baker c80c8dcf24 prefill id server box with default if there isn't one 2019-08-13 17:55:10 +01:00
David Baker 596ff93049 unused import 2019-08-13 16:38:46 +01:00
David Baker 2539da0dfa Use fetch instead of browser-request 2019-08-13 16:37:56 +01:00
David Baker 31fd36efba use accessiblebutton 2019-08-13 16:20:30 +01:00
David Baker 02504b9959 make it work again 2019-08-13 12:59:34 +01:00
David Baker 7afaba3bf1 link to doc issue 2019-08-13 11:05:41 +01:00
David Baker 860a9dbc82 s/tooltip/tooltipContent/ 2019-08-13 11:01:04 +01:00
David Baker c36c3a9b33 other general grammar
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-13 10:51:26 +01:00
David Baker 934b711936 write Identity Server out in full to be less confusing
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-13 10:48:56 +01:00
David Baker c732ae3aa9 Correct license header
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-08-13 10:46:42 +01:00
David Baker 0c4b29faa9 Merge remote-tracking branch 'origin/dbkr/change_is' into dbkr/disco_is 2019-08-12 14:47:40 +01:00