mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 15:51:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
13684 commits 219 branches 562 tags 474 MiB
Commit graph

2914 commits

Author SHA1 Message Date
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
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