Commit Graph

  • d8b059452c fix rogue ` Matthew Hodgson 2020-01-31 13:04:00 +00:00
  • 2d9b111680 Add an override for the theme David Baker 2020-01-31 12:28:14 +00:00
  • 02cada7cc6 First pass of copy changes J. Ryan Stinnett 2020-01-31 12:15:19 +00:00
  • b64ba1dbbf Add temporary feature flag to control padlocks J. Ryan Stinnett 2020-01-31 11:09:49 +00:00
  • 0447501c3b Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 11:06:01 +00:00
  • 630507304a Merge pull request #4012 from matrix-org/dbkr/just_one_zxcvbn_suggestion David Baker 2020-01-31 11:05:54 +00:00
  • 9e92d2ab1c Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 11:00:20 +00:00
  • c111d70deb Merge pull request #4009 from matrix-org/dbkr/log_exceptions_other_than_cancel David Baker 2020-01-31 11:00:16 +00:00
  • 96d5fb5ce3 Only display the first zxcvbn warning/suggestion David Baker 2020-01-31 10:59:35 +00:00
  • 1a95a1d4ba Add title to complete security loading J. Ryan Stinnett 2020-01-31 10:47:58 +00:00
  • 025adb0a6f Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 10:46:02 +00:00
  • 19ab395c18 Merge pull request #3995 from matrix-org/jryans/4s-in-mem J. Ryan Stinnett 2020-01-31 10:45:57 +00:00
  • ea7f160950 lint David Baker 2020-01-31 10:38:20 +00:00
  • af0598bbcb double-check user verification Zoe 2020-01-31 10:37:40 +00:00
  • 26c9b64c3b Log exceptions from accessSecretStorage David Baker 2020-01-31 10:35:05 +00:00
  • 5ab707bd8b Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 10:20:18 +00:00
  • 68b2454920 Merge pull request #4006 from matrix-org/jryans/user-list-deco J. Ryan Stinnett 2020-01-31 10:20:13 +00:00
  • e9426680be Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 10:20:10 +00:00
  • fe33e2664f Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-01-31 09:58:40 +00:00
  • 24075dc248 Merge pull request #4005 from matrix-org/dbkr/encryption_events David Baker 2020-01-31 10:20:03 +00:00
  • 31476737ea Enforce a max width on power labels J. Ryan Stinnett 2020-01-31 10:11:34 +00:00
  • 36d7b8e3ed don't close in UI, a js-sdk event will do that Zoe 2020-01-31 09:59:24 +00:00
  • d0ab37ac50 Only say the room is encrypted if it actually is David Baker 2020-01-31 09:58:21 +00:00
  • 2e65ec2c58 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-31 09:58:05 +00:00
  • eb02c60abe Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-01-31 02:47:34 +00:00
  • 585a38cd45 Merge pull request #4000 from matrix-org/foldleft/12038-copy Zoe 2020-01-31 09:57:52 +00:00
  • fde30577e4 Fix escaped markdown passing backslashes through BobVul 2020-01-31 12:33:10 +11:00
  • bf9f473ed9 Add a class for styling room directory permissions Stasiek Michalski 2020-01-31 00:09:08 +01:00
  • 29ad4baea6 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 22:43:25 +00:00
  • 6f6d6b096a Ensure QR code, verified hero are centered J. Ryan Stinnett 2020-01-30 22:43:14 +00:00
  • 5c4b91457e Fix tests J. Ryan Stinnett 2020-01-30 22:28:56 +00:00
  • 673fb792e5 Remove unused power level icons J. Ryan Stinnett 2020-01-30 22:08:01 +00:00
  • 3ef7e5113b Move power label to right of name J. Ryan Stinnett 2020-01-30 22:04:47 +00:00
  • 5933bd15b1 Remove strange size change on member hover J. Ryan Stinnett 2020-01-30 21:46:49 +00:00
  • 57c4293fc6 Add verification status icons to room members J. Ryan Stinnett 2020-01-30 21:38:40 +00:00
  • 246a4406c9 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 21:16:56 +00:00
  • b98b0fe478 Merge pull request #4004 from matrix-org/t3chguy/invite Michael Telatynski 2020-01-30 21:16:51 +00:00
  • 813114390f Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 21:16:12 +00:00
  • 3a9acb55e7 Merge pull request #4003 from matrix-org/t3chguy/room_complete Michael Telatynski 2020-01-30 21:16:06 +00:00
  • 7db6f89a9f hmm, there were two things using the client :(( Michael Telatynski 2020-01-30 21:07:32 +00:00
  • 1e09399dd6 delint and collapse two consecutive filter operations Michael Telatynski 2020-01-30 21:01:55 +00:00
  • 7e45979e00 change order of if or conditions as micro-optimization Michael Telatynski 2020-01-30 20:59:30 +00:00
  • 58d16fea7d lint David Baker 2020-01-30 20:59:27 +00:00
  • d56de6a673 i18n again David Baker 2020-01-30 20:52:37 +00:00
  • f84795ebae Remove now unused code from TextForEvent David Baker 2020-01-30 20:50:12 +00:00
  • 5760e71318 i18n David Baker 2020-01-30 20:50:06 +00:00
  • 2332cdb5d8 full stop David Baker 2020-01-30 20:47:46 +00:00
  • 5447a04f8e oops, forgot the component David Baker 2020-01-30 20:15:15 +00:00
  • 39e9bffe1f Make encryption events into bubble-style tiles David Baker 2020-01-30 20:03:26 +00:00
  • bc71092b81 Use Sets instead of array scans and simplify hiding of invalid users to invite Michael Telatynski 2020-01-30 19:27:59 +00:00
  • b84fd245b1 Fix room completion for invited rooms and upgraded rooms Michael Telatynski 2020-01-30 18:03:45 +00:00
  • 724cff6a2e Update QR code rendering to support VerificationRequests Travis Ralston 2020-01-30 16:55:43 +00:00
  • e58b59c26e don't tell users to verify themselves in person Zoe 2020-01-30 16:41:25 +00:00
  • bae35c0859 Change power icon to label instead J. Ryan Stinnett 2020-01-30 16:00:09 +00:00
  • ceebb7dc55 Remove unused Entities, UserTile modules J. Ryan Stinnett 2020-01-30 15:19:35 +00:00
  • f787bde80a copy Zoe 2020-01-30 16:36:57 +00:00
  • c5306fd7b6 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 16:30:24 +00:00
  • 8a09cfbfbd Merge pull request #3999 from matrix-org/dbkr/user_info_black_shields David Baker 2020-01-30 16:30:19 +00:00
  • a9d85e1fa3 lint Zoe 2020-01-30 16:27:35 +00:00
  • 4f62fc16bd lint David Baker 2020-01-30 16:19:04 +00:00
  • a92b14c7ab Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 16:13:00 +00:00
  • ddc628c804 Merge pull request #3994 from matrix-org/jryans/verify-user-text J. Ryan Stinnett 2020-01-30 16:12:55 +00:00
  • 4a3ea30e52 copy for verification screen Zoe 2020-01-30 16:11:05 +00:00
  • 77618d30fd Actually this is green because it's a link David Baker 2020-01-30 16:08:42 +00:00
  • 9f5f15d1d3 Update copy when the user verifies their own devices Zoe 2020-01-30 15:58:23 +00:00
  • 0956d00637 Make shields in UserInfo black if user isn't verified David Baker 2020-01-30 15:59:03 +00:00
  • 99b04a6f70 lint Zoe 2020-01-30 15:41:26 +00:00
  • 49d2ed8906 ... and take action when the counter reaches zero in verification toast Zoe 2020-01-30 15:37:44 +00:00
  • 7e98ea79d2 Fix verification toast timeouts to not stick at 0 Zoe 2020-01-30 15:31:20 +00:00
  • e94af1e643 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 15:19:38 +00:00
  • f6e2f3082e Merge pull request #3996 from matrix-org/foldleft/12097-lock-login-inputs Zoe 2020-01-30 15:19:32 +00:00
  • 318689f40b Disable all inputs in login form while busy, not just the submit button Zoe 2020-01-30 15:06:36 +00:00
  • 788cb24093 Add advanced option to keep secret storage in memory for session J. Ryan Stinnett 2020-01-30 14:18:12 +00:00
  • fd5798aa87 Change verify user text J. Ryan Stinnett 2020-01-30 13:21:51 +00:00
  • e18e01217c Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 13:10:37 +00:00
  • 767015d19d Merge pull request #3993 from matrix-org/foldleft/12106-round-two Zoe 2020-01-30 13:10:32 +00:00
  • ae57feaf70 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 13:08:47 +00:00
  • 9c8ffb6c4e Merge pull request #3990 from matrix-org/t3chguy/fix_composer_placeholder J. Ryan Stinnett 2020-01-30 13:08:42 +00:00
  • 4c1cc6feba fix SAS dialog width Zoe 2020-01-30 12:21:13 +00:00
  • 4de9a2074e Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 11:53:34 +00:00
  • e43de26720 Merge pull request #3992 from matrix-org/dbkr/default_display_name_register David Baker 2020-01-30 11:53:29 +00:00
  • c8673452be Merge remote-tracking branch 'origin/develop' into dbkr/default_display_name_register David Baker 2020-01-30 11:45:54 +00:00
  • 2f4b3272da Send initial device display najme on register David Baker 2020-01-30 11:27:54 +00:00
  • cbd9c52ad8 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 11:26:19 +00:00
  • 67468d85c6 Merge pull request #3959 from matrix-org/travis/update-qr-code Travis Ralston 2020-01-30 11:26:13 +00:00
  • 68c61a057e Merge branch 'origin/develop' into Weblate. Weblate 2020-01-30 11:16:24 +00:00
  • f2dda28ad3 Translated using Weblate (Italian) random 2020-01-30 09:07:04 +00:00
  • 7038481394 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-01-30 04:05:44 +00:00
  • 1cd2b7d190 Merge pull request #3989 from matrix-org/t3chguy/olympics J. Ryan Stinnett 2020-01-30 11:16:14 +00:00
  • 52ed55d887 Update placeholder when it changes, not sure how this ever worked Michael Telatynski 2020-01-30 00:23:19 +00:00
  • ea0fafc4e9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/olympics Michael Telatynski 2020-01-29 22:55:02 +00:00
  • afecaa1662 fix left margins in UserInfo Michael Telatynski 2020-01-29 22:54:56 +00:00
  • d17a2ff80c clean up unused CSS rules Michael Telatynski 2020-01-29 22:54:45 +00:00
  • 4de21aa676 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-29 22:45:40 +00:00
  • 1475f5c73a Merge pull request #3988 from matrix-org/t3chguy/fix_Field_usage Michael Telatynski 2020-01-29 22:45:34 +00:00
  • 33ec73095e Apply the Olympic effect to SAS Emoji Verification Michael Telatynski 2020-01-29 22:44:49 +00:00
  • a180dddc66 Pass an ID to the <Field/> as needed and fix div inside p nesting Michael Telatynski 2020-01-29 22:31:19 +00:00
  • 6d6813efaa Merge branch 'origin/develop' into Weblate. Weblate 2020-01-29 22:22:59 +00:00
  • c851cc6070 Merge pull request #3987 from matrix-org/jryans/update-user-info-trust J. Ryan Stinnett 2020-01-29 22:22:54 +00:00
  • eaa48665d2 Guard request input J. Ryan Stinnett 2020-01-29 21:59:30 +00:00