Commit Graph

6504 Commits

Author SHA1 Message Date
David Baker d74d5f1e27 Fix unused imports 2019-02-08 17:30:14 +00:00
Travis Ralston e06a68501a Typo
Co-Authored-By: dbkr <dbkr@users.noreply.github.com>
2019-02-08 17:23:18 +00:00
David Baker 043f1ab3f0 Remove key backup & sas from labs 2019-02-08 16:58:09 +00:00
David Baker 2cd25e0077 Merge pull request #2596 from matrix-org/dbkr/emoji_sas
Change SAS to decimal / emoji
2019-02-08 16:46:43 +00:00
Travis Ralston 8cdfdd2e24 Merge branch 'develop' into travis/render-join-rules 2019-02-08 09:24:07 -07:00
Travis Ralston 78ea531a87 Merge pull request #2590 from matrix-org/travis/settings/fix-directory-publish
Ensure toggle switches listen to property changes
2019-02-08 08:00:47 -07:00
Travis Ralston 47b79c0cf6 Merge pull request #2593 from matrix-org/travis/settings/local-echo
Local echo on room access settings
2019-02-08 07:58:51 -07:00
David Baker ae16cc36aa Change SAS to decimal / emoji
Requires https://github.com/matrix-org/matrix-js-sdk/pull/837
2019-02-08 14:57:36 +00:00
Bruno Windels 3c5fb61350 Merge branch 'develop' into bwindels/customtags-featureflag 2019-02-08 12:12:43 +00:00
Bruno Windels 2eff03ba78 fix whitespace 2019-02-08 12:03:58 +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
David Baker abcbd46fe1 Merge pull request #2583 from matrix-org/dbkr/trust_on_decrypt
Trust on decrypt
2019-02-08 11:36:53 +00:00
David Baker e805df7b4c Use fewer brs 2019-02-08 10:46:38 +00:00
David Baker d1e2418b75 Use error constant from the class 2019-02-08 10:43:39 +00:00
Bruno Windels 748040268a remove unused imports 2019-02-08 09:59:24 +00:00
Travis Ralston f66c92b1fd Local echo on room access settings
Includes a fix for the aliases warning appearing at the wrong time. 

Fixes https://github.com/vector-im/riot-web/issues/8406
Fixes https://github.com/vector-im/riot-web/issues/8434
2019-02-07 14:01:34 -07:00
Travis Ralston 5d4406cbab Render join rules and guest access changes in the timeline
Fixes https://github.com/vector-im/riot-web/issues/8435
2019-02-07 12:14:58 -07:00
Travis Ralston 89a8422320 Ensure toggle switches listen to property changes
They do local echo on changes to avoid jumping back and forth while requests are ongoing, however some areas modify the checked state after the toggle has mounted.

Fixes https://github.com/vector-im/riot-web/issues/8432
2019-02-07 11:54:13 -07:00
Bruno Windels 8c32f88c1c remove homeserver ll check on toggling lab setting 2019-02-07 18:45:00 +00:00
Bruno Windels ac4ab11985 remove ll feature flag, it's time! 2019-02-07 18:24:07 +00:00
Bruno Windels e8533beafb guard custom tags with feature flag 2019-02-07 18:07:30 +00:00
David Baker 3a924d05b5 Remove click-to-verify from SAS
The click-each-pair to verify was hard to discover, so remove it
2019-02-07 17:01:55 +00:00
Travis Ralston 3e70212ec8 Merge pull request #2580 from matrix-org/travis/settings/fix-pl
Actually change power levels when they are changed
2019-02-07 08:13:35 -07: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 594bd86a0c Merge pull request #2582 from matrix-org/bwindels/fixnotifbadgeclickandcursor
Fix: click on notif badge
2019-02-07 14:12:00 +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
Bruno Windels 252a61379c its list, not lists 2019-02-07 13:40:29 +00:00
Bruno Windels 87ddb8a453 Merge pull request #2575 from matrix-org/bwindels/customtags
Bring back custom tags, also badges on communities
2019-02-07 11:37:17 +00:00
Bruno Windels 7b23fa7a4f implement PR feedback 2019-02-07 10:49:23 +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 8b2f2c7d5c Remove unneeded refs from reset password 2019-02-07 09:44:28 +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
Travis Ralston 2e852da72e Actually change power levels when they are changed 2019-02-06 15:06:15 -07:00
Bastian d77f10e085 Reformat
Signed-off-by: Bastian <matrix@noxware.de>
2019-02-06 19:37:23 +01:00
Bastian 7428e97910 Clean up InfoButton
Signed-off-by: Bastian <matrix@noxware.de>
2019-02-06 19:35:48 +01:00
J. Ryan Stinnett 2b7ecd3de7 Go to forgot phase on error 2019-02-06 18:32:28 +00:00
J. Ryan Stinnett 9f9f0d4168 Move server details to a separate phase of forgot password 2019-02-06 18:30:07 +00:00
Bastian 4dcbb6fc0f Update copyright
Signed-off-by: Bastian <matrix@noxware.de>
2019-02-06 19:27:53 +01:00
J. Ryan Stinnett 7680667334 Avoid controlled component error with empty strings 2019-02-06 18:26:44 +00:00
J. Ryan Stinnett 0e543a362e Move errors to top of reset password 2019-02-06 18:10:06 +00:00
Travis Ralston 04f2375273 Add issue references to things 2019-02-06 11:06:02 -07: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 b2c161c7c1 Merge branch 'develop' into travis/settings/delete-the-old 2019-02-06 11:02:21 -07:00
J. Ryan Stinnett 3afc455f3c Extract each phase to a separate function 2019-02-06 18:00:58 +00:00
Bruno Windels d501ce0553 increase debouncing of filtering because its quite laggy atm 2019-02-06 17:25:56 +00:00
J. Ryan Stinnett a61de03a88 Remove left over TODO 2019-02-06 16:32:22 +00:00
J. Ryan Stinnett b20f1d1240 Convert forgot password to phases like the other flows 2019-02-06 16:30:53 +00:00
J. Ryan Stinnett 8aff6b2e45 Add your account header to reset password 2019-02-06 16:14:21 +00:00