Commit graph

8019 commits

Author SHA1 Message Date
Travis Ralston
6449016d4b Fix alignment of discovery section addresses
We target the addresses specifically to avoid crushing the subsection text.
2019-08-21 14:41:25 -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
5bf0587cc5 Don't double translate labs settings
SettingsStore.getDisplayName() already calls _t() for us.

Fixes https://github.com/vector-im/riot-web/issues/10586
2019-08-21 08:55:19 -06:00
Travis Ralston
2dc28a608f Move URL abbreviation to its own util file 2019-08-21 08:46:10 -06:00
Travis Ralston
c758b5d3f1 We don't use reject 2019-08-21 08:43:42 -06:00
Bruno Windels
c7c87ccd9c
Merge pull request #3328 from matrix-org/bwindels/modifier-refocus-fix-attempt
Explicitly check for modifier keydown events before focusing composer
2019-08-21 07:39:11 +00: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
Jason Robinson
29085895a7 Fix regression on widget panel edit button
Due to commit ffa49df889
the parameters for the call to open a widget in edit mode from the
widget panel in a room has broken. The `screen` parameter needs
to be prefixed with `type_` as it was before.

This corresponds to parameters supplied when creating the URL when
opening a widget in edit mode through Scalar screens.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
2019-08-20 15:55:57 +03:00
Bruno Windels
b42b2825c4 explicitly check for modifier keydown events 2019-08-20 10:43:03 +02:00
David Baker
f5da870040
Merge pull request #3326 from matrix-org/dbkr/device_name_public
Clarify that device names are publicly visible
2019-08-20 09:29:45 +01:00
Travis Ralston
7cd2fb3718 Appease the linter
It really wants a trailing comma.
2019-08-19 23:03:01 -06:00
Travis Ralston
3181829532 Use new InlineTermsAgreement component on IS Discovery section
Fixes https://github.com/vector-im/riot-web/issues/10522
2019-08-19 23:00:05 -06:00
Travis Ralston
417de0cac7 Add an inline terms agreement component
Handles agreement of terms in an inline way.
2019-08-19 22:59:33 -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
David Baker
f7083ac332 Clarify that device names are publicly visible
And also a bunch of other UI fixes in the devices table:
 * It's the devices table, don't need 'device' in all the headers
 * Not really necessary to label checkboxes with 'select'
 * Stop table from moving down when the delete button appears

Fixes https://github.com/vector-im/riot-web/issues/10216
2019-08-19 18:09:37 +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
David Baker
6879ddd34c
Merge pull request #3323 from matrix-org/dbkr/add_3pid_without_is
Allow 3pids to be added with no ID server set
2019-08-19 17:02:56 +01:00
David Baker
93af6cfd8d Fix up remove threepid confirmation UX
Probably still not the best design but hopefully break fewer UX rules:

1. Use red to confirm delete rather than cancel and green to cancel
2. Show the action you're about to perform in the confirmation
3. Label confirmation button with the action rather than yes/no.
2019-08-19 15:37:12 +01:00
David Baker
c1b72fd346 Allow 3pids to be added with no ID server set
Fixes https://github.com/vector-im/riot-web/issues/10573
2019-08-19 15:17:14 +01: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
J. Ryan Stinnett
07826c5675 Hide 3PID discovery sections when no identity server
This hides the email and phone sections of Discovery in the Settings when there
is no IS, as they can't meaningfully be used.

Part of https://github.com/vector-im/riot-web/issues/10528
2019-08-19 14:03:43 +01:00
David Baker
cd26b73386
Merge pull request #3319 from matrix-org/dbkr/allow_pw_reset_no_is
Allow password reset without an ID Server
2019-08-19 11:41:38 +01:00
David Baker
2a626c3f7c
Merge pull request #3318 from matrix-org/dbkr/allow_register_email_no_is
Allow registering with email if no ID Server
2019-08-19 11:18:30 +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
3228062954 Merge branch 'travis/terms/inline-is-only' into travis/is-account-data 2019-08-16 12:45:40 -06:00
Michael Telatynski
a96df333e9
Merge pull request #3310 from matrix-org/t3chguy/fix_reply_parent_redacted
Fix showing events which were replied to and then redacted
2019-08-16 19:19:25 +01:00
David Baker
dbe5c2cb45 Allow password reset without an ID Server
If the server advertises that it supports doing so

Requires matrix-org/matrix-js-sdk#1018
Requires matrix-org/matrix-js-sdk#1019
Fixes vector-im/riot-web#10572
2019-08-16 18:11:24 +01:00
Travis Ralston
2456912ec7 Merge remote-tracking branch 'origin/develop' into travis/terms/inline-is-only 2019-08-16 09:41:00 -06:00
David Baker
3c4c595f79 remove old serverCaps 2019-08-16 15:27:11 +01:00
David Baker
41a9db3224 Use new flag in /versions 2019-08-16 15:07:15 +01:00
Travis Ralston
218bee8071
Merge pull request #3316 from matrix-org/travis/terms/inline-im-is
Prompt for terms of service on integration manager changes
2019-08-16 07:31:36 -06:00
David Baker
e705d110af Allow registering with email if no ID Server
If the server advertises that it supports doing so

This version uses a random me.dbkr prefix until the MSC is
written.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/1017
Implements https://github.com/matrix-org/matrix-doc/pull/2233
2019-08-16 11:57:32 +01:00
David Baker
cde1944cac
Merge pull request #3314 from matrix-org/dbkr/warn_if_bound_threepids
Warn on disconnecting from IS
2019-08-16 10:56:39 +01: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
Travis Ralston
5fe691cf33 Double equals 2019-08-15 13:33:02 -06:00
Travis Ralston
e2f013ddb4 Appease the linter
This looks awkward, but should pass.
2019-08-15 13:31:45 -06:00
Travis Ralston
27504e1578 Prompt for terms of service on integration manager changes
Part of https://github.com/vector-im/riot-web/issues/10539
2019-08-15 13:28:23 -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
ded2297523
Merge pull request #3315 from matrix-org/dbkr/fix_set_im
Fix set integration manager tooltip
2019-08-15 15:38:34 +01:00
J. Ryan Stinnett
d31f556c1f Move ICE fallback prompt to time of placing / answering calls
This moves the ICE fallback prompt out of session startup and instead it will
now appear contextually when your either place a call with no ICE server from
the homeserver or a call fails (in either direction).

Fixes https://github.com/vector-im/riot-web/issues/10546
2019-08-15 15:05:25 +01:00
J. Ryan Stinnett
1c6312d999 Store ICE fallback permission in device setting
This stores the ICE server fallback permission in a device setting so it is
remembered across sessions.

Part of https://github.com/matrix-org/matrix-react-sdk/pull/3309
2019-08-15 15:04:23 +01:00
J. Ryan Stinnett
c1378f8e0b Prompt for ICE server fallback permission
This adds a prompt at the start of each session when the homeserver does not
have any ICE servers configured. The fallback ICE server is only used if the
user allows it. The dialog also recommends notifying the homeserver admin to
rectify the issue.

Fixes https://github.com/vector-im/riot-web/issues/10173
2019-08-15 15:04:23 +01:00
David Baker
40f693d0fc Fix set integration manager tooltip
The name of the prop changed in the original PR and this one didn't
get updated.
2019-08-15 14:55:59 +01:00
David Baker
6f07f9157c lint 2019-08-15 13:10:05 +01:00
David Baker
54fb1b5302 Unused variables / imports 2019-08-15 12:07:59 +01:00