Commit graph

6602 commits

Author SHA1 Message Date
David Baker
e41fc55cca Add warnings about trusted computers 2019-02-12 16:34:06 +00:00
David Baker
3a0b8cb169 Lint 2019-02-12 16:03:46 +00:00
David Baker
9ec00f8d9b Change text in e2e UX to new copy 2019-02-12 16:01:38 +00:00
Bruno Windels
f189ff54a8 hide delete & cancel button on stickers are they weren't visible before 2019-02-12 17:01:05 +01:00
Bruno Windels
229d905835 copyright 2019-02-12 12:21:40 +01:00
Bruno Windels
2315e4bfb4 add animation when adding a room 2019-02-12 12:16:56 +01:00
David Baker
c2247cdc67
Merge pull request #2613 from matrix-org/dbkr/sas_profile
Add display name / avatar to incoming sas dialog
2019-02-12 10:48:49 +00:00
Bruno Windels
03c491416e put breadcrumbs behind feature flag 2019-02-12 11:41:24 +01:00
Bruno Windels
735c9d1121 hide breadcrumbs when collapsed 2019-02-12 11:31:50 +01:00
Bruno Windels
5efd92f3ec make rooms come in from left rather than the right 2019-02-12 11:26:46 +01:00
Bruno Windels
aaea40a93d add breadcrumbs component 2019-02-12 11:04:25 +01:00
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
Bruno Windels
7c72fddf80 Merge branch 'develop' into bwindels/roomlistlag 2019-02-11 17:06:16 +01:00
David Baker
99ae63c021 Add display name / avatar to incoming sas dialog
Fetch the other user's profile & display it on an incoming verification
request
2019-02-11 15:57:34 +00:00
Bruno Windels
ab6535b135 lint 2019-02-11 16:27:29 +01:00
Bruno Windels
fbc0bbfb6f clear hover flag after 1000ms of not moving the mouse
as a fix for #8184
2019-02-11 16:17:15 +01:00
Bruno Windels
b6aa72da55 update RoomTile notificationCount through props so updates are consistent 2019-02-11 15:40:17 +01: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
Andrew Morgan
d66dbf9be7
Change taking a community off the left-left panel less scary
With the current wording, I half-think clicking this button might remove me from the community!

IMO 'Hide' sounds more like it's just going to disappear from the panel, but I can add it back at some point.
2019-02-11 13:38:47 +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
Bruno Windels
6f9aa9c9b9 Merge branch 'develop' into bwindels/roomlistlag 2019-02-08 16:38:57 +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