PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
13969 commits 1 branch 0 tags 338 MiB
Commit graph

843 commits

Author SHA1 Message Date
J. Ryan Stinnett
df5f0601aa
Merge pull request #2641 from matrix-org/dbkr/remove_welcome_from_topleft 
Remove 'welcome' from top-left menu
 2019-02-14 16:40:39 +00:00
J. Ryan Stinnett
ce68ff1214
Merge pull request #2640 from jryans/help-buoy 
Update help buoy text and issue links
 2019-02-14 16:17:34 +00:00
Travis Ralston
37d1191c72 Add credit for cover photo usage 
Fixes https://github.com/vector-im/riot-web/issues/8374
 2019-02-14 09:04:15 -07:00
David Baker
7845a63506 Remove 'welcome' from top-left menu 
Tjis is quite confusing as the welcome page is designed for when
you're not logged in, ie. has a sign-in button. There's also no way
to get back into the app so it really looks like it's logged you
out.

Reverts 116367fd69
 2019-02-14 15:53:52 +00:00
J. Ryan Stinnett
2a3b05a321 Update help buoy text and issue links 2019-02-14 15:52:13 +00:00
J. Ryan Stinnett
694a59afb7
Merge pull request #2628 from jryans/adjust-top-left-menu 
Adjust top left menu items
 2019-02-13 17:38:08 +00:00
J. Ryan Stinnett
116367fd69 Add welcome to top left menu for all 2019-02-13 16:13:32 +00:00
J. Ryan Stinnett
22789ada94 Add sign in to top left menu for guests 2019-02-13 16:01:13 +00:00
David Baker
737b85c8f0
Merge pull request #2623 from matrix-org/dbkr/fix_force_turn_flag 
Security: Force TURN setting was inverted
 2019-02-13 15:24:14 +00:00
Matthew Hodgson
3eb5c71b75 rename 'Close Account' back to 'Deactivate Account'. 
the word close on a red button makes you feel like you're going to close the
settings dialog, not terminate your account...
 2019-02-13 12:24:04 +00:00
David Baker
26287067fc Security: Force TURN setting was inverted 
In making the settings more positive, we flipped 'disable peer to
peer' but didn't change the caption, so the setting was inverted
from what it was labelled as.

Also, forcing p2p isn't the inverse of forcing turn.

Change the setting to be 'allow p2p' and the label to match.
 2019-02-13 11:51:32 +00:00
J. Ryan Stinnett
e401b8f77a Make default and dark the only theme options 2019-02-13 10:44:01 +00:00
J. Ryan Stinnett
d9bb5991b5
Merge pull request #2609 from matrix-org/anoa/comms_hide 
Change taking a community off the left-left panel less scary
 2019-02-13 09:30:18 +00:00
Bruno Windels
5047d15a3b
Merge pull request #2615 from matrix-org/bwindels/breadcrumbs 
Labs feature: recent room breadcrumbs
 2019-02-13 09:16:40 +01:00
David Baker
2eaba22d63 Better passphase confirm text 2019-02-12 20:14:43 +00:00
Andrew Morgan
d6acfea696 Update i18n 2019-02-12 19:37:39 +00:00
David Baker
2c5da21adb KeyBackupPanel fixes 
* Separate out the emoji from the translateable string
 * Put back the delete button if you're not using the backup,
   otherwise you're stuck unable to use key backup at all if you
   lost your recovery secret and the device you set it up on.
 2019-02-12 18:06:36 +00:00
David Baker
9ec00f8d9b Change text in e2e UX to new copy 2019-02-12 16:01:38 +00:00
Bruno Windels
b467bfdced mention it only shows up after refresh (actually rerender) 2019-02-12 12:49:22 +01:00
Bruno Windels
03c491416e put breadcrumbs behind feature flag 2019-02-12 11:41:24 +01: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
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
David Baker
cedefcfb33 re-run i18n 2019-02-08 17:24:15 +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
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
85cfd48744 join rules -> join rule 2019-02-08 09:15:12 -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
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
Bruno Windels
2bcb54e749 remove strings from removed code 2019-02-08 09:29:11 +00: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
Bruno Windels
e8533beafb guard custom tags with feature flag 2019-02-07 18:07:30 +00:00
J. Ryan Stinnett
7cc38f9d96 Remove a few more references to home 2019-02-07 17:09:16 +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