Commit Graph

6533 Commits

Author SHA1 Message Date
J. Ryan Stinnett fbc1779b21 Merge pull request #2611 from matrix-org/jryans/welcome-page-cleanup
Welcome page cleanup
2019-02-12 09:18:21 +00:00
J. Ryan Stinnett 44e34d9074 Explain roomId workaround 2019-02-12 08:59:38 +00:00
J. Ryan Stinnett 9d3ba2b3d9 Guard against invalid room object on join 2019-02-11 14:33:19 +00:00
J. Ryan Stinnett 4101d4e9de Always change to LOGGED_IN view to show a room 2019-02-11 14:19:05 +00:00
J. Ryan Stinnett 477d5ac0dc View welcome behind modals when not showing logged in view 2019-02-11 13:31:27 +00:00
David Baker ba597c65eb lint 2019-02-11 13:09:50 +00:00
J. Ryan Stinnett 97aa0b52fa Avoid room directory error without a client 2019-02-11 12:27:10 +00:00
David Baker 1cf0a6a049 Add legacy verification button on wait
Add a way to bail out of interactive verification from the screen
where you're waiting for the other person to accept.
2019-02-11 12:08:10 +00:00
J. Ryan Stinnett 5977859dd9 Call isGuest correctly 2019-02-08 18:28:39 +00:00
David Baker 742af81224 Merge pull request #2594 from matrix-org/dbkr/dont_verify_restore
Prompt to restore backup rather than verify
2019-02-08 17:49:04 +00:00
David Baker 09bf8099e0 Merge pull request #2599 from matrix-org/dbkr/unlabs_keybackup_sas
Remove key backup & sas from labs
2019-02-08 17:41:54 +00:00
Bruno Windels 7f630b2b46 Merge pull request #2601 from matrix-org/bwindels/fixstartdm
Fix: typeerror when creating DM
2019-02-08 17:39:29 +00:00
Bruno Windels 8fdb94911c header doesn't have a room yet while joining 2019-02-08 17:35:49 +00:00
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 f99c56fedb Merge pull request #2597 from matrix-org/jryans/add-welcome-page
SDK support for welcome page
2019-02-08 17:17:22 +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
David Baker 9b4a6cf442 Make prettier 2019-02-08 16:27:25 +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
J. Ryan Stinnett 705c3248d4 Tweak embedded pages config name 2019-02-08 13:55:23 +00:00
J. Ryan Stinnett 7a15bb65c4 Tweak page URL defaulting 2019-02-08 13:53:17 +00:00
J. Ryan Stinnett 5ab3c8b823 Add top left home menu item when home page configured 2019-02-08 13:48:51 +00:00
J. Ryan Stinnett 5701bf89de Direct some flows to the welcome page 2019-02-08 12:12:43 +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 ac98da4a8a Prompt to restore backup rather than verify
Direct the user to restore the backup in order to both get the keys
out of the backup and start putting them in.

Also hide the advanced key backup stuff in a diclosure.
2019-02-08 11:51:22 +00:00
J. Ryan Stinnett 7238c713d7 Add language selector to bottom of welcome 2019-02-08 11:39:30 +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
J. Ryan Stinnett 1cf311da10 Place welcome content directly on glass 2019-02-08 11:26:47 +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
J. Ryan Stinnett c587dcab92 Use separate config settings for each page 2019-02-07 17:16:02 +00:00
J. Ryan Stinnett 7cc38f9d96 Remove a few more references to home 2019-02-07 17:09:16 +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
J. Ryan Stinnett b7c92ce3ff Abort embedded page load for null URL 2019-02-07 16:31:44 +00:00
J. Ryan Stinnett 843f86fc1c Add separate welcome view 2019-02-07 16:25:09 +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