Commit Graph

13787 Commits (5e298dc58de42eabb2c6fedd54a726b6eb9f66ee)

Author SHA1 Message Date
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 3afc455f3c Extract each phase to a separate function 2019-02-06 18:00:58 +00:00
Bruno Windels 0f7b73bc1b
Merge pull request #2576 from matrix-org/bwindels/debouncefiltermore
increase debouncing of filtering because its quite laggy atm
2019-02-06 17:31:19 +00:00
Bruno Windels d501ce0553 increase debouncing of filtering because its quite laggy atm 2019-02-06 17:25:56 +00:00
Bruno Windels 699023ea40 prevent tagtiles jumping when selected 2019-02-06 16:53:48 +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
J. Ryan Stinnett 8e12c4a3b8 Normalize URL naming for reset password 2019-02-06 15:58:31 +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 ccf7e75c95 Group fields into rows on reset password 2019-02-06 15:10:16 +00:00
Bruno Windels 547c8cb206 render badge on community 2019-02-06 14:31:43 +00:00
Bruno Windels a222ee33df calculate badges for communities in TagOrderStore 2019-02-06 14:29:40 +00:00
Bruno Windels 97db9cd99e fix css regression of context menu 2019-02-06 14:24:44 +00:00
Bruno Windels 1a1f8bdf82 fix wrong way of unregistering from store 2019-02-06 14:24:17 +00:00
Bruno Windels 0ab6ab639e render badge on custom tag in LLP 2019-02-06 11:21:50 +00:00
Bruno Windels 77db3ca883 calculate badge count for tags as well 2019-02-06 11:02:12 +00:00
Bruno Windels 7b367e267b move sublist badge aggregation code to RoomNotifs to reuse for tags/comm 2019-02-06 10:51:29 +00:00
J. Ryan Stinnett ce2066b741
Merge pull request #2573 from jryans/field-selected-overlap
Tweak field padding to avoid overlapping with selected text
2019-02-06 08:49:11 +00:00
J. Ryan Stinnett df91e55feb
Merge pull request #2574 from jryans/auth-login-v2
Adapt login flow for the v2 design
2019-02-06 08:48:08 +00:00
Bruno Windels b9b83605b6 leave my regex along, lint 2019-02-05 19:31:14 +00:00
Bruno Windels 137ff984c7 rather unsophisticated attempt at trimming common prefixes for avatar 2019-02-05 19:12:34 +00:00
Bruno Windels b79394722a make sure scrollbar is at the far right edge of the LLP 2019-02-05 18:03:16 +00:00
Bruno Windels 604020dd59 add selectable custom tags below tag panel 2019-02-05 17:39:02 +00:00
Bruno Windels 414fffba3f only show selected custom tags in room list 2019-02-05 17:38:36 +00:00
Bruno Windels 579309c2e3 store for custom tags to share state between tag panel & room list 2019-02-05 17:37:25 +00:00
Bruno Windels bdc7936130 move help & communities button out of tag panel
so we can shove the custom tag buttons between them
in the next commit
2019-02-05 17:36:33 +00:00
Bruno Windels 3265fe394d don't filter out custom tags anymore 2019-02-05 17:35:05 +00:00
J. Ryan Stinnett 71c30b5641 Add some basic login tests 2019-02-05 16:33:12 +00:00
J. Ryan Stinnett 6549ae1ce5 Remove unused props from login 2019-02-05 16:11:32 +00:00
J. Ryan Stinnett 36bf06d87a Tweak field padding to avoid overlapping with selected text 2019-02-05 15:50:56 +00:00
J. Ryan Stinnett 02a20fa668 Tweak login wording to match design 2019-02-05 15:36:00 +00:00
J. Ryan Stinnett dbe14c5527 Enable phases for login, but start on the login phase by default 2019-02-05 14:43:29 +00:00
J. Ryan Stinnett 4e152f82e7 Remove server types from login 2019-02-05 14:30:45 +00:00
David Baker 94f6f65fac
Merge pull request #2572 from matrix-org/dbkr/remove_arrow_paren_linting_rule
Remove the arrow-paren lint rule
2019-02-05 13:33:32 +00:00
David Baker 32dbbbe7b1 Remove the arrow-paren lint rule
It's now in the base lint rules file: https://github.com/matrix-org/matrix-js-sdk/pull/834
2019-02-05 13:13:20 +00:00
David Baker 74d460b4ca
Merge pull request #2571 from jryans/auth-disable-custom-urls
Ensure we show registration form when custom URLs are disabled
2019-02-05 10:54:52 +00:00
David Baker 8598c4f9a0
Merge pull request #2568 from matrix-org/bwindels/fixcollapsesearchterm
Fix: search term disappears when collapsing and expanding left panel
2019-02-05 10:45:07 +00:00
David Baker 4dd8febf1d
Merge pull request #2567 from matrix-org/bwindels/fixjumpdownwhitespace
Fix: 'jump to bottom' creates big amounts of whitespace at the bottom
2019-02-05 10:38:24 +00:00
J. Ryan Stinnett 71d1a24fcb Add some basic registration tests 2019-02-05 09:26:45 +00:00
J. Ryan Stinnett a73e3dcd4c Remove unused props from registration 2019-02-05 07:11:29 +00:00
J. Ryan Stinnett 5432b09478 Default to registration phase when custom URLs disabled 2019-02-05 05:25:13 +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
Bruno Windels 24db3e4804
Merge pull request #2566 from matrix-org/bwindels/fixfilterwhitespace
Fix: being able to size sections in leftpanel larger than their content while filtering
2019-02-04 18:55:18 +00:00
Bruno Windels a6d7f6a4c7 remove unused variable 2019-02-04 18:52:10 +00:00
Bruno Windels bdc3e1173d preserve SearchBox searchTerm state when collapsing 2019-02-04 18:51:41 +00:00
Bruno Windels f029aad9fa rename to getLayout 2019-02-04 18:38:31 +00:00