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
fb38787c37
Merge pull request #3332 from matrix-org/travis/fix-i18n
...
Don't double translate labs settings
2019-08-21 09:01:40 -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
9332308a51
Merge pull request #3330 from matrix-org/travis/settings-fix
...
Touch up settings: alignment, spacing, error states
2019-08-20 16:07:18 -06:00
Travis Ralston
0b2331440b
Newlines mean everything
2019-08-20 13:24:51 -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
Jason Robinson
3c1adf62af
Merge pull request #3329 from matrix-org/jaywink/fix-widget-edit-button
...
Fix regression on widget panel edit button
2019-08-20 17:43:09 +03: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
525b4cad0f
Support IS token handling without checking terms
...
This is so we can optionally do our own terms handling.
2019-08-19 22:54:23 -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
e7e22b75bc
Merge pull request #3320 from matrix-org/travis/is-account-data
...
Persist and maintain identity server in account data
2019-08-19 10:50:58 -06: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
855bf3ad0d
Import createClient instead
2019-08-19 10:28:04 -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
fa58fb7fdd
Merge pull request #3324 from matrix-org/dbkr/threepid_remove_design
...
Fix up remove threepid confirmation UX
2019-08-19 16:05:15 +01:00
J. Ryan Stinnett
8a7b43fd1a
Tweak Settings padding / margin slightly
...
This makes a few small tweaks to Settings padding and margin, but more is still
needed. I am told that https://github.com/vector-im/riot-web/issues/10554 will
soon take a holistic view on the problem, so this is a more conservation
temporary change.
2019-08-19 15:45:04 +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
f9e223aec7
Merge pull request #3322 from matrix-org/jryans/discovery-without-is
...
Improve Discovery section when no IS set
2019-08-19 15:02:11 +01:00
J. Ryan Stinnett
5af9bf7b80
Use designed text for new IS field
2019-08-19 14:44:53 +01:00
J. Ryan Stinnett
7cc27beb44
Remove custom font size for IM URL
...
As best as I can tell, the designs call for the IM URL to be the same size as
other subheadings. The font size in Zeplin doesn't match what is currently used
in Settings, so this likely caused confusion.
2019-08-19 14:34:22 +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
David Baker
cf1b7ab342
Merge pull request #3321 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-08-19 10:19:37 +01:00
Tuomas Hietala
f130335169
Translated using Weblate (Finnish)
...
Currently translated at 98.6% (1712 of 1737 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-08-19 08:44:46 +00:00
Jeff Huang
f32c4de1f5
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1737 of 1737 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-08-19 08:44:45 +00:00
MorbidMind
32a402322e
Translated using Weblate (Polish)
...
Currently translated at 71.4% (1241 of 1737 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2019-08-18 18:08:17 +00:00
Kévin C
37a247613e
Translated using Weblate (French)
...
Currently translated at 100.0% (1737 of 1737 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-08-18 18:08:16 +00: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
Weblate
d9aa8139bd
Merge branch 'origin/develop' into Weblate.
2019-08-16 18:19:30 +00: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
de3c489fba
Fix i18n
2019-08-16 09:41:23 -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
David Baker
a87fb7eaa2
also remove from comment
2019-08-16 15:36:41 +01:00