Commit Graph

2902 Commits (cf1366635f64071375ca82d6e5f25c2bb274ebe2)

Author SHA1 Message Date
Bruno Windels 3c5fb61350 Merge branch 'develop' into bwindels/customtags-featureflag 2019-02-08 12:12:43 +00:00
Bruno Windels 00a1ca503c
Merge pull request #2588 from matrix-org/bwindels/removellfeatureflag
remove ll feature flag, it's time!
2019-02-08 12:02:58 +00:00
Bruno Windels 2bcb54e749 remove strings from removed code 2019-02-08 09:29:11 +00:00
Bruno Windels e8533beafb guard custom tags with feature flag 2019-02-07 18:07:30 +00:00
David Baker f79b777dd4 Trust on decrypt
Add support for trust-on-decrypt (API change, recognise flag on
isKeyBackupTrusted). Catch rejection on wrong passphrase / recovery
key. Fix remembering whether we are restoring with key or passphrase.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/836
2019-02-07 14:39:47 +00:00
David Baker b7fd1336de
Merge pull request #2532 from boeserwolf/boeserwolf/get-set-topic
Extend slash command '/topic' to display the room topic
2019-02-07 13:45:59 +00:00
J. Ryan Stinnett 30395f064d
Merge pull request #2578 from jryans/auth-reset-password
Style reset password to match design
2019-02-07 10:05:11 +00:00
J. Ryan Stinnett d03f4875f3 Update style for forgot password copy, add full stops 2019-02-07 09:57:31 +00:00
J. Ryan Stinnett e1b7af39dc Basic validation of HS URL for reset password 2019-02-07 09:36:43 +00:00
David Baker f517928d76
Merge pull request #2577 from matrix-org/dbkr/backup_dont_fail_if_no_keys
Key Backup: Don't fail if no keys
2019-02-07 09:30:28 +00:00
David Baker ce565f109a Key Backup: Don't fail if no keys
Only fail if there were any keys in the backup (which does mean
that the backup will always succeed if there aren't any keys which
could also be misleading, but is probably not as bad and can probably
be fixed with Trust on Decrypt).

Also cheekily fix the error message so it talks about passphrases
if you used a passphrase and recovery keys if you used a recovery key.
2019-02-06 18:03:47 +00:00
Travis Ralston e13149ed2c regen i18n due to merge 2019-02-06 11:02:56 -07:00
Travis Ralston b2c161c7c1 Merge branch 'develop' into travis/settings/delete-the-old 2019-02-06 11:02:21 -07:00
J. Ryan Stinnett 8aff6b2e45 Add your account header to reset password 2019-02-06 16:14:21 +00:00
J. Ryan Stinnett 8c6dc002f3 Add new footer text to reset password 2019-02-06 15:46:25 +00:00
J. Ryan Stinnett 5d0798ed24 Tweak field labels on reset password 2019-02-06 15:16:54 +00:00
J. Ryan Stinnett 02a20fa668 Tweak login wording to match design 2019-02-05 15:36:00 +00:00
Travis Ralston eac50aa800 Remove old user and room settings
This takes out the old user and room settings, replacing the paths with the new dialog editions. The labs setting has been removed in order to support this change.

In addition to removing the old components outright, some older components which were only used by the settings pages have been removed. The exception is the ColorSettings component as it has a high chance of sticking around in the future.

Styles that were shared by the settings components have been broken out to dedicated sections, making it easier to remove the old styles entirely.

Some stability testing of the app has been performed to ensure the app still works, however given the scope of this change there is a possibility of some broken functionality.
2019-02-04 13:40:21 -07:00
Travis Ralston 8307af6871
Merge pull request #2563 from matrix-org/travis/remove-e2e-beta-dialog
Remove warning about encryption being beta
2019-02-01 15:12:25 -07:00
Bruno Windels 45e982ac13
Merge pull request #2557 from matrix-org/bwindels/e2eicons
Add e2e icon to room header/composer/member info, more ...
2019-02-01 22:02:28 +00:00
Travis Ralston 016bd028ba Remove warning about encryption being beta 2019-02-01 14:56:29 -07:00
J. Ryan Stinnett 3bfd603dab Remove guest warning bar 2019-02-01 15:28:16 -06:00
Bruno Windels ea8de6fe07 add translations 2019-02-01 19:13:17 +01:00
J. Ryan Stinnett 22178f2d7c
Merge pull request #2548 from jryans/auth-reg-disabled
Add error message when registration is disabled
2019-02-01 08:59:44 -06:00
J. Ryan Stinnett e414fe434c Add full stop 2019-02-01 08:32:47 -06:00
J. Ryan Stinnett 918d4490c7 Add more detail to error message 2019-02-01 08:31:54 -06:00
J. Ryan Stinnett e6b6133c7a
Merge pull request #2552 from jryans/spell-homeserver
Spell homeserver correctly
2019-02-01 08:26:17 -06:00
Travis Ralston 7bbc302975
Merge pull request #2549 from matrix-org/travis/settings/fixes-2
Fixed settings dialog header; Adjust padding on dialog
2019-01-31 21:41:09 -07:00
J. Ryan Stinnett 68ae72f855 Spell homeserver correctly 2019-01-31 18:52:39 -06:00
J. Ryan Stinnett 6905e3e54c Fix typo on registration 2019-01-31 18:15:18 -06:00
Travis Ralston 4036e52c24 Fixed settings dialog header; Adjust padding on dialog
Some recent changes to dialogs changed how this works and altered the look of the settings dialogs. This fixes that and makes it so that the header and content scroll independently.

Fixes https://github.com/vector-im/riot-web/issues/8329
Fixes https://github.com/vector-im/riot-web/issues/8328
2019-01-31 15:52:22 -07:00
J. Ryan Stinnett bc4a603672 Add error message when registration is disabled 2019-01-31 16:02:42 -06:00
Bastian 3e2bcd1d3c Update i18n
Signed-off-by: Bastian <matrix@noxware.de>
2019-01-31 18:02:08 +01:00
Bastian 022dd14b55 Merge branch 'develop' into boeserwolf/get-set-topic 2019-01-31 10:57:51 +01:00
Bastian b96a4a4092 Fix typo
Signed-off-by: Bastian <matrix@noxware.de>
2019-01-30 17:27:53 +01:00
Bastian 135af401f7 Merge branch 'develop' into boeserwolf/get-set-topic 2019-01-30 14:21:58 +01:00
Bruno Windels 4d2a93eaaf
Merge pull request #2527 from jryans/auth-registration
Style registration flow
2019-01-30 11:27:45 +00:00
Bastian 5f90321d0f Update i18n 2019-01-30 12:19:14 +01:00
Travis Ralston a2a49c1981 Regen i18n due to merge 2019-01-29 22:16:20 -07:00
Travis Ralston f86e224db6 Merge branch 'experimental' into travis/rsettings/tab/security 2019-01-29 22:15:55 -07:00
Travis Ralston da95bf9c08 Regen i18n due to merge 2019-01-29 21:50:13 -07:00
Travis Ralston cd54442add Merge branch 'experimental' into travis/rsettings/tab/advanced 2019-01-29 21:49:00 -07:00
Travis Ralston 2fe7f6fe1c Implement the Advanced tab of new room settings 2019-01-29 18:23:01 -07:00
J. Ryan Stinnett f05ddcacf0 Add footer text to registration form 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 61a3ddb4e3 Adjust registration field labels 2019-01-29 17:38:28 -06:00
J. Ryan Stinnett 1f78b59a0e Add create your account header 2019-01-29 17:38:28 -06:00
Travis Ralston 0af419633f Implement the Roles & Permissions tab of new room settings
This is largely copy/paste from the current room settings
2019-01-29 15:54:51 -07:00
Travis Ralston a2f516c461 Implement the Security & Privacy tab of new room settings 2019-01-29 14:31:07 -07:00
Bruno Windels 0cce912cf6
Merge pull request #2519 from matrix-org/bwindels/roomdirectory-makeover
Redesign: room directory makeover
2019-01-29 19:21:42 +00:00
Travis Ralston a16eb30cbc
Merge pull request #2518 from matrix-org/travis/rver-cap-support
Iterate upon the room upgrade warning bar
2019-01-29 11:29:17 -07:00