2061ce2dbf
Merge pull request #2509 from matrix-org/dbkr/logout_warning_wording
...
Tweak wording on logout warning
2019-01-25 18:25:37 +00:00
86e9417a19
Merge pull request #2508 from matrix-org/dbkr/fix_roomrecoveryreminder_npe
...
Fix NPE in RoomRecoveryReminder
2019-01-25 18:09:59 +00:00
47c2ca3384
Tweak wording on logout warning
...
I further tweaked the wording from Tom's in the bug report to
put passphrases first since they are supposed to be the norm
(and the correct term is "recovery passphrase").
Fixes https://github.com/vector-im/riot-web/issues/8214
2019-01-25 18:01:40 +00:00
de9b964490
Fix NPE in RoomRecoveryReminder
...
Also fix a bug introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/2506
where I failed to set the button caption in one case.
Fixes https://github.com/vector-im/riot-web/issues/8216
2019-01-25 17:49:02 +00:00
1b5be8603c
Merge pull request #2506 from matrix-org/dbkr/room_recovery_reminder_verifydevice
...
New text/caption for key backup by verifying device
2019-01-25 17:13:09 +00:00
41bc2a3d0c
Merge pull request #2499 from matrix-org/travis/usettings/tab/security
...
Implement the "Security & Privacy" tab of new user settings
2019-01-25 09:44:00 -07:00
f6bbfd7e0d
New text/caption for key backup by verifying device
...
https://github.com/vector-im/riot-web/issues/8072
2019-01-25 16:25:15 +00:00
fb36f7abef
Fix imports and quotes
2019-01-25 09:18:00 -07:00
3e69be5139
Regenerate i18n due to conflicts
2019-01-25 09:12:45 -07:00
f7f23e4dea
Merge branch 'experimental' into travis/usettings/tab/security
2019-01-25 09:12:07 -07:00
949343d7d5
Merge pull request #2505 from matrix-org/travis/settings/animated-toggles
...
Add simple animations to toggle switches
2019-01-25 07:51:38 -07:00
7a2cc3a242
Merge pull request #2503 from matrix-org/travis/settings/placeholders
...
Default a Field's placeholder to the label
2019-01-25 07:51:07 -07:00
3301c35f7d
Merge pull request #2501 from matrix-org/travis/settings/dialog-size
...
Have the settings dialog be fixed in size
2019-01-25 07:46:36 -07:00
f58d016137
Merge pull request #2500 from matrix-org/travis/usettings/tab/help
...
Implement the "Help & About" tab of new user settings
2019-01-25 07:44:10 -07:00
9bbbab9d03
Add simple animations to toggle switches
2019-01-24 21:24:28 -07:00
d819095a76
Default a Field's placeholder to the label
...
Fixes https://github.com/vector-im/riot-web/issues/8250
This keeps all fields in line with the design without them having to defining it twice. The option is kept in the first place as some fields might want to override the placeholder to be longer than the label or something.
2019-01-24 19:36:23 -07:00
5dc75e2d3c
Have the settings dialog be fixed in size
...
This also brings out some classes that aren't solely applicable to the user settings and will be applicable to the room settings as well.
2019-01-24 19:12:09 -07:00
1f10cda5e4
Implement the "Help & About" tab of new user settings
2019-01-24 17:10:35 -07:00
b0a8cbf75f
Implement the "Security & Privacy" tab of new user settings
2019-01-24 15:47:04 -07:00
c5deeeaceb
Merge pull request #2498 from matrix-org/travis/usettings/tab/voice
...
Implement the "Voice & Video" tab of new user settings
2019-01-24 14:59:32 -07:00
0f89668446
Also the font size
2019-01-24 14:42:30 -07:00
87cea5ef09
Fix sizings and margins
2019-01-24 14:41:00 -07:00
3e09cd1d2e
Appease the linter
2019-01-24 13:43:16 -07:00
a4e0796bfe
Swap out the media permissions text for a paragraph element
...
The sizing ratio looks way off when the text is just subtext.
2019-01-24 13:37:20 -07:00
27ee6625ee
Implement the "Voice & Video" tab of new user settings
2019-01-24 13:33:22 -07:00
77b551a911
Merge pull request #2497 from matrix-org/travis/usettings/tab/labs-screenshot
...
Add widget screenshots to the Labs section
2019-01-24 13:22:55 -07:00
67ba728457
Add widget screenshots to the Labs section
...
This is a normal setting and not a real labs setting, however the design calls for it to be here.
2019-01-24 12:38:48 -07:00
13e36bcead
Merge pull request #2495 from matrix-org/travis/usettings/tab/preferences
...
Implement the "Preferences" tab on new user settings
2019-01-24 12:05:25 -07:00
524d2f1e11
Force font family upon Fields
2019-01-24 11:43:03 -07:00
8c412b85ee
Merge pull request #2496 from matrix-org/dbkr/target_blank
...
Add target="_blank" to links that don't have it
2019-01-24 18:15:18 +00:00
5479a4dac5
Implement the "Preferences" tab on new user settings
2019-01-24 10:32:29 -07:00
479b354d97
Merge pull request #2494 from matrix-org/travis/usettings/tab/notifications
...
Implement the "Notifications" tab of new user settings
2019-01-24 10:31:20 -07:00
ade43c4e5b
Lint
2019-01-24 17:19:04 +00:00
98eb95b5bd
Regenerate i18n
2019-01-24 10:12:25 -07:00
a9243cf851
Appease the linter
2019-01-24 10:12:25 -07:00
06a9ab3a70
Styling to match the other tabs a bit closer
...
Introduces a new component to reduce code duplication
2019-01-24 10:12:25 -07:00
d267f232bc
Embed existing notifications settings into the tab
2019-01-24 10:12:25 -07:00
73bce4d645
Merge pull request #2492 from matrix-org/travis/usettings/tab/labs
...
Implement the "Labs" tab of new user settings
2019-01-24 10:11:30 -07:00
4bcb9f12d4
Add target="_blank" to links that don't have it
...
This is now more of a problem in the Electron app because of
https://github.com/electron/electron/issues/8841 but is still
annoying in the webapp if you're taken away from your chat client.
Exception is the SSO link, as commented (issue filed at
https://github.com/vector-im/riot-web/issues/8247 ).
Fixes https://github.com/vector-im/riot-web/issues/8226
2019-01-24 16:19:18 +00:00
7249247c7e
Regenerate i18n
2019-01-24 08:52:45 -07:00
1251f607ef
Add missing import
2019-01-24 08:52:45 -07:00
d2684638b4
Actually include the lazy loading function
2019-01-24 08:52:45 -07:00
f1c1caac62
Implement labs tab in new user settings
2019-01-24 08:52:45 -07:00
2a9f6186d7
Merge pull request #2491 from matrix-org/travis/usettings/tab/general
...
Implement the "General" tab of new user settings
2019-01-24 08:51:11 -07:00
736aa8297d
Minor CSS adjustments
2019-01-23 18:49:27 -07:00
7b5500b9e8
Merge pull request #2493 from jryans/auth-lint
...
Appease linter in auth related files
2019-01-23 19:04:54 -06:00
41c79a93c0
Merge pull request #2489 from jryans/auth-text-and-links
...
Update text and links in authentication flows
2019-01-23 18:40:55 -06:00
319369d1be
Fix remaining warnings for enabled files
2019-01-23 18:38:49 -06:00
9470424bcb
Enable linting for all auth related files
2019-01-23 18:32:36 -06:00
dccc9dc42f
Fix linting error
2019-01-23 18:11:34 -06:00
David Baker