Commit Graph

  • 4b7cc12daa check if there is already a request in progress when clicking verify Bruno Windels 2020-02-13 14:34:44 +01:00
  • 68197a1d18 also update phase after starting request Bruno Windels 2020-02-13 14:33:35 +01:00
  • d49fbf25f7 check if verifier sasEvent was already set on mount Bruno Windels 2020-02-13 14:32:33 +01:00
  • ccb88cd422 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-13 12:46:38 +00:00
  • 4952b5b001 Merge pull request #4068 from matrix-org/t3chguy/piwik_csp Michael Telatynski 2020-02-13 12:46:33 +00:00
  • f53c415504 Fix sending of visit variables Michael Telatynski 2020-02-13 11:50:40 +00:00
  • 6ed8a7593e Merge branch 'origin/develop' into Weblate. Weblate 2020-02-13 10:59:08 +00:00
  • 12c743b160 Merge pull request #4066 from matrix-org/t3chguy/piwik_csp Michael Telatynski 2020-02-13 10:59:02 +00:00
  • 0c4ee0091e Update comment and clear up localstorage on disabling Michael Telatynski 2020-02-13 10:47:50 +00:00
  • 9649f2a2da don't show tooltips on big icons Zoe 2020-02-13 10:11:48 +00:00
  • 93c412c584 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-13 08:51:44 +00:00
  • 98e8fed26e Translated using Weblate (Hungarian) Szimszon 2020-02-13 06:58:47 +00:00
  • ec708b5e9b Merge pull request #4058 from matrix-org/bwindels/dontpassmethodstoverify Bruno Windels 2020-02-13 08:51:36 +00:00
  • 8d445d54ec Use embedded piwik caller rather than piwik.js bcuz CSP :D Michael Telatynski 2020-02-13 00:39:28 +00:00
  • d6d0831c16 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-12 17:44:44 +00:00
  • d172e1bf85 Revert "Merge pull request #4060 from matrix-org/travis/better-invite" Travis Ralston 2020-02-12 10:03:33 -07:00
  • 8ce73192cc Merge branch 'origin/develop' into Weblate. Weblate 2020-02-12 17:04:32 +00:00
  • b514f89594 Merge pull request #4061 from matrix-org/travis/fix-settings-handling Travis Ralston 2020-02-12 10:04:26 -07:00
  • 8943546fd9 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-12 17:03:40 +00:00
  • 48860f0a10 Merge pull request #4060 from matrix-org/travis/better-invite Travis Ralston 2020-02-12 10:03:33 -07:00
  • b984764268 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-12 15:36:09 +00:00
  • b46af07752 Merge pull request #4051 from TestardR/feature/WhoIsTyping J. Ryan Stinnett 2020-02-12 15:36:02 +00:00
  • 8cabf45ec4 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-12 14:10:33 +00:00
  • 13e03bb696 Translated using Weblate (Albanian) Besnik Bleta 2020-02-12 13:44:36 +00:00
  • d1cce3030c Merge pull request #4065 from matrix-org/foldleft/12335-verification-panel Zoe 2020-02-12 14:10:26 +00:00
  • e1608509d0 Disable 'start' button after clicking in VerificationPanel Zoe 2020-02-12 13:53:16 +00:00
  • aba11f0a2f Merge branch 'origin/develop' into Weblate. Weblate 2020-02-12 11:18:37 +00:00
  • 466d4a3e51 Merge pull request #4057 from matrix-org/foldleft/12221-secret-storage Zoe 2020-02-12 11:18:32 +00:00
  • 72f1c2a763 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-12 10:04:54 +00:00
  • 3c5abf1fc4 Translated using Weblate (Hungarian) Szimszon 2020-02-11 20:23:29 +00:00
  • 790ed65a17 Translated using Weblate (French) Kévin C 2020-02-12 08:26:57 +00:00
  • 37435bce45 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-02-12 02:46:46 +00:00
  • 97ab0636d9 Merge pull request #4062 from MarcoZehe/PresentationalAvatars Michael Telatynski 2020-02-12 10:04:39 +00:00
  • 8004a35179 Update to use proper quotes and fix code styling. And fix test. Marco Zehe 2020-02-12 10:54:08 +01:00
  • 6fe4eb1fc3 Don't render avatars in pills for screen readers. Marco Zehe 2020-02-12 09:36:59 +01:00
  • a05dafc300 Check for null config settings a bit safer Travis Ralston 2020-02-12 01:58:21 +00:00
  • 9acf70c693 Score user ID searches higher when they match nearly exactly Travis Ralston 2020-02-12 01:55:20 +00:00
  • be70ef44f8 lint Hubert Chathi 2020-02-11 15:34:14 -05:00
  • 4c5046afd5 refactor event grouping into separate helper classes Hubert Chathi 2020-02-11 15:19:32 -05:00
  • 078401c58f I have reverted and used the styling a bit higher in the DOM unknown 2020-02-11 20:06:07 +01:00
  • c8e65bfa65 flip sense of 'force' flag in if statement Zoe 2020-02-11 17:56:25 +00:00
  • 33f3a61b94 remove unused imports Bruno Windels 2020-02-11 17:56:40 +01:00
  • a1844e44f2 remove methods arg to requestVerification(DM) Bruno Windels 2020-02-11 17:44:41 +01:00
  • 99bbc2bdae Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 17:20:46 +00:00
  • 91c9c00712 Merge pull request #4044 from matrix-org/bwindels/riotx-qr-compat Bruno Windels 2020-02-11 17:20:40 +00:00
  • 5382a52519 Fixed bug where key reset didn't always return the right key Zoe 2020-02-11 15:56:32 +00:00
  • a56d21d80a Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 15:35:30 +00:00
  • 7a026eb15d Merge pull request #4043 from matrix-org/bwindels/showunverifieddevicedialogonclick Bruno Windels 2020-02-11 15:35:24 +00:00
  • 0e366c3ddd Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 15:35:06 +00:00
  • 1d39aa6a81 Merge pull request #4049 from matrix-org/bwindels/verifybuttonsdisable Bruno Windels 2020-02-11 15:35:00 +00:00
  • f206baadd1 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 15:34:32 +00:00
  • 703f52be33 Merge pull request #4048 from matrix-org/bwindels/toasttuning Bruno Windels 2020-02-11 15:34:26 +00:00
  • 5267dbf44a Update src/components/views/right_panel/UserInfo.js Bruno Windels 2020-02-11 15:21:01 +00:00
  • 628be1e90a Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 15:16:54 +00:00
  • a84e90df51 Merge pull request #4042 from matrix-org/bwindels/encryptionpaneleverywhere Bruno Windels 2020-02-11 15:16:47 +00:00
  • ae237901b0 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 13:44:08 +00:00
  • e54d34090a Merge pull request #4056 from matrix-org/foldleft/12221-temp-remove Zoe 2020-02-11 13:44:02 +00:00
  • cbb0ad6621 god i hate the i18n linter Zoe 2020-02-11 13:20:27 +00:00
  • 0482a277e1 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 13:19:24 +00:00
  • 8c36792840 Merge pull request #4055 from matrix-org/foldleft/12288-correct-feedback-order Zoe 2020-02-11 13:19:18 +00:00
  • 627ced3838 quick fix for cross-signing reset bug Zoe 2020-02-11 13:17:18 +00:00
  • 9a5663056d lint Zoe 2020-02-11 12:06:40 +00:00
  • a677780889 i18n Zoe 2020-02-11 12:05:58 +00:00
  • 6b6d612041 Fix error message rendering for key entry Zoe 2020-02-11 11:59:49 +00:00
  • b8e75ef440 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 10:18:49 +00:00
  • 67aa241ee5 Merge pull request #4052 from matrix-org/t3chguy/recaptcha_protocol Michael Telatynski 2020-02-11 10:18:44 +00:00
  • 56b723353b Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 10:11:26 +00:00
  • 36fa6261cf Merge pull request #4054 from matrix-org/t3chguy/showTypingNotifications Michael Telatynski 2020-02-11 10:11:20 +00:00
  • ee819dfdf8 fix call to SettngsStore.watchSetting, it takes a roomID Michael Telatynski 2020-02-11 09:32:09 +00:00
  • 70d12607dd Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 09:30:35 +00:00
  • f381099f2a Merge pull request #4053 from matrix-org/t3chguy/server_enter Michael Telatynski 2020-02-11 09:30:29 +00:00
  • da737952ec Merge branch 'origin/develop' into Weblate. Weblate 2020-02-11 08:19:39 +00:00
  • 136dca7837 Translated using Weblate (French) Kévin C 2020-02-11 07:25:52 +00:00
  • 5436662d92 Translated using Weblate (Czech) Stanislav Lukeš 2020-02-10 19:28:35 +00:00
  • dd4aaf230a Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-02-11 02:14:48 +00:00
  • f5111a6290 Translated using Weblate (Albanian) Besnik Bleta 2020-02-10 19:49:08 +00:00
  • 1e94929b88 Merge pull request #4045 from matrix-org/bwindels/qrcodetuning Bruno Windels 2020-02-11 08:19:29 +00:00
  • f01b4fe241 Allow custom hs url submission on enter Michael Telatynski 2020-02-10 20:47:27 +00:00
  • 86306e3da3 Recaptcha should always be loaded over https Michael Telatynski 2020-02-10 20:41:16 +00:00
  • 3da630beb8 I have removed problematic ligns unknown 2020-02-10 21:38:31 +01:00
  • 2e2d90f335 Merge branch 'origin/develop' into Weblate. Weblate 2020-02-10 19:18:54 +00:00
  • b3fb496212 Merge pull request #12310 from MattWThomas/patch-1 Michael Telatynski 2020-02-10 19:18:48 +00:00
  • a24959319d Add top left menu shortcut Matthew Thomas 2020-02-10 12:59:35 -06:00
  • 8365f9d88d Merge branch 'origin/develop' into Weblate. Weblate 2020-02-10 18:01:58 +00:00
  • b9db0ad013 Merge pull request #4047 from matrix-org/t3chguy/hide_typing_notifs Michael Telatynski 2020-02-10 18:01:52 +00:00
  • 39318d6c6a Merge branch 'origin/develop' into Weblate. Weblate 2020-02-10 17:14:11 +00:00
  • d47d13256f Merge pull request #4041 from matrix-org/foldleft/12221-reset-cross-signing Zoe 2020-02-10 17:14:05 +00:00
  • 2d42505124 and re-run yarn i18n Zoe 2020-02-10 17:00:03 +00:00
  • 4f4b52d666 Update src/components/views/settings/CrossSigningPanel.js Zoe 2020-02-10 16:59:17 +00:00
  • 9dde09d36f cleanup Bruno Windels 2020-01-31 14:42:27 +01:00
  • ccde5530d2 Add reciprocate as a method Travis Ralston 2020-01-31 12:23:59 +00:00
  • afc38b92a0 Always send scan for RiotX (for now) Travis Ralston 2020-01-31 11:51:24 +00:00
  • ea7cb6ba0b Support keepSecretStoragePassphraseForSession at the config level too Travis Ralston 2020-02-02 14:31:21 +00:00
  • 4b8382b5c4 remove dead code Bruno Windels 2020-02-10 17:07:02 +01:00
  • 1ff1575b42 remove dead code Bruno Windels 2020-02-10 16:59:47 +01:00
  • 69dc725006 rename button Zoe 2020-02-10 15:43:02 +00:00
  • 936b40f6b5 remove commented out code Bruno Windels 2020-02-10 15:53:36 +01:00
  • 0e0b0e8d09 fix css lint Bruno Windels 2020-02-10 15:30:16 +01:00
  • a693af0c6b fix lint Bruno Windels 2020-02-10 14:48:10 +01:00
  • 2a8453b939 i18n fixes Bruno Windels 2020-02-10 14:44:20 +01:00