Commit Graph

  • 7e0ab2f0a3 DisableEventIndexDialog: Turn the cancel button red. Damir Jelić 2020-01-27 15:28:43 +01:00
  • 0eb49c4c72 Merge pull request #3948 from matrix-org/foldleft/12035-room-decoration-design-pass-2 Zoe 2020-01-27 14:15:32 +00:00
  • c0d1298c4f Factor out into BridgeTile Half-Shot 2020-01-27 14:05:22 +00:00
  • e224150190 detail pass on DMs Zoe 2020-01-27 12:17:12 +00:00
  • 9782599c69 Merge branch 'master' into develop RiotRobot 2020-01-27 12:02:44 +00:00
  • 768cabe4bb v1.5.8 v1.5.8 RiotRobot 2020-01-27 11:57:49 +00:00
  • 5d01384af2 Prepare changelog for v1.5.8 RiotRobot 2020-01-27 11:57:49 +00:00
  • 15a77e8826 v1.5.8 RiotRobot 2020-01-27 11:52:56 +00:00
  • dd26d43173 js-sdk 4.0.0 & react-sdk 2.0.0 RiotRobot 2020-01-27 11:52:18 +00:00
  • 7a79b78292 Merge branch 'master' into develop RiotRobot 2020-01-27 11:46:56 +00:00
  • 8c56c59922 v2.0.0 RiotRobot 2020-01-27 11:44:10 +00:00
  • 976ac328e1 Prepare changelog for v2.0.0 RiotRobot 2020-01-27 11:44:10 +00:00
  • 692c993a34 js-sdk v4.0.0 RiotRobot 2020-01-27 11:40:05 +00:00
  • 1ab91d1d74 Merge pull request #3943 from matrix-org/dbkr/kill_lingering_verification_toast David Baker 2020-01-27 11:17:55 +00:00
  • 6737523b1c Merge pull request #3942 from matrix-org/dbkr/show_incoming_verifications_in_complete_security David Baker 2020-01-27 11:17:16 +00:00
  • c9a0e93a74 tidy up borders Half-Shot 2020-01-27 11:14:32 +00:00
  • 11de92b9a9 hopefully informative comment David Baker 2020-01-27 11:07:55 +00:00
  • 1356b61276 Merge pull request #3941 from matrix-org/dbkr/dismiss_logged_out_device_toasts David Baker 2020-01-27 10:25:20 +00:00
  • e50ed95edf English David Baker 2020-01-27 10:17:16 +00:00
  • d5ac37a4ab Merge pull request #3940 from matrix-org/dbkr/e2e_upgrade_toast David Baker 2020-01-27 10:16:18 +00:00
  • 8b214d20b5 Merge pull request #3947 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk David Baker 2020-01-27 10:16:07 +00:00
  • 59d3bd2746 Merge pull request #12062 from RiotTranslateBot/weblate-riot-web-riot-web David Baker 2020-01-27 10:07:37 +00:00
  • 8c4c79adde i18n David Baker 2020-01-27 10:05:42 +00:00
  • 43173824d3 Capitalisation David Baker 2020-01-27 09:44:39 +00:00
  • ebb70ca9fb English David Baker 2020-01-27 09:44:12 +00:00
  • d418ab8e64 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-27 09:43:40 +00:00
  • 08b685d04f Merge pull request #3939 from matrix-org/dbkr/remember_password_bootstrap David Baker 2020-01-27 09:43:35 +00:00
  • 3ba56f8c94 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-27 09:42:52 +00:00
  • ca774f45fe Translated using Weblate (Turkish) catborise 2020-01-26 19:49:59 +00:00
  • 13ba90a054 Translated using Weblate (Esperanto) Tirifto 2020-01-27 09:33:34 +00:00
  • acf09a004f Merge pull request #3946 from matrix-org/t3chguy/emoji Michael Telatynski 2020-01-27 09:42:44 +00:00
  • a4bbe2ba64 fix compound emoji Michael Telatynski 2020-01-26 22:15:44 +00:00
  • 49cdbc9ebe Translated using Weblate (Albanian) Besnik Bleta 2020-01-25 16:25:51 +00:00
  • 086e43e584 comments ftw David Baker 2020-01-25 21:30:42 +00:00
  • f851f976e7 Stop rogue verification toast if you verify during login David Baker 2020-01-25 21:26:43 +00:00
  • 9e38c62791 Show incoming verification requests in the 'complete security' phase David Baker 2020-01-25 20:42:45 +00:00
  • 7169a84449 Dismiss toasts for logged out devices David Baker 2020-01-25 17:08:31 +00:00
  • 8c5fd5c77e Verification nag toasts David Baker 2020-01-25 16:52:12 +00:00
  • 437b45f8a6 Remember password for e2e bootstrapping David Baker 2020-01-25 15:28:06 +00:00
  • 369636277f Merge branch 'origin/develop' into Weblate. Weblate 2020-01-25 12:40:31 +00:00
  • c96f82cd8b Translated using Weblate (French) Kévin C 2020-01-25 08:09:22 +00:00
  • e710607a72 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-01-25 08:22:40 +00:00
  • 440b3fd1fd Translated using Weblate (Basque) Osoitz 2020-01-25 11:39:29 +00:00
  • 988ae14d35 Merge pull request #3937 from matrix-org/dbkr/e2esetup David Baker 2020-01-25 12:40:17 +00:00
  • 1bbb104600 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 22:47:37 +00:00
  • 9c258f9da9 Merge pull request #12049 from vector-im/jryans/webpack-minimal J. Ryan Stinnett 2020-01-24 22:47:32 +00:00
  • d3d749ac73 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 22:39:52 +00:00
  • cb34f37a2c Merge pull request #3935 from matrix-org/jryans/prof-avatar-size J. Ryan Stinnett 2020-01-24 22:39:47 +00:00
  • 6895ad1009 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 22:39:14 +00:00
  • 204b7d3362 Merge pull request #3936 from matrix-org/jryans/hide-default-enc-algo J. Ryan Stinnett 2020-01-24 22:39:08 +00:00
  • cf08aa2b0e Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 22:36:49 +00:00
  • 662c723bf3 Translated using Weblate (Turkish) catborise 2020-01-24 18:48:00 +00:00
  • 95df8b9bb7 Translated using Weblate (Hungarian) Szimszon 2020-01-24 18:34:27 +00:00
  • ee303b0d56 Merge pull request #3938 from matrix-org/jryans/webpack-warnings J. Ryan Stinnett 2020-01-24 22:36:39 +00:00
  • 4c4f885f25 Change to minimal Webpack output J. Ryan Stinnett 2020-01-24 22:33:17 +00:00
  • 9991a544aa Resolve default export warnings from Webpack J. Ryan Stinnett 2020-01-24 22:26:28 +00:00
  • 3d7137d4ad Setup flow for cross-signing on login / registration David Baker 2020-01-24 19:11:57 +00:00
  • bf0e1efce8 Hide default encryption algorithm J. Ryan Stinnett 2020-01-24 17:53:30 +00:00
  • 2021498755 Update profile avatar letter size J. Ryan Stinnett 2020-01-24 17:31:00 +00:00
  • bf9d943a5c Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 16:49:36 +00:00
  • 1986f13275 Merge pull request #3934 from matrix-org/travis/cross-signing-info Travis Ralston 2020-01-24 09:49:30 -07:00
  • 540a7f5c02 less duplication Travis Ralston 2020-01-24 09:41:47 -07:00
  • b67256c7c2 post-merge fix Michael Telatynski 2020-01-24 16:41:43 +00:00
  • 91d59556db Also check for our own key ID Travis Ralston 2020-01-24 09:37:12 -07:00
  • f8e0dcf264 Add null check for cross-signing info in verification panel Travis Ralston 2020-01-24 09:33:55 -07:00
  • 342fcb09c4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration Michael Telatynski 2020-01-24 16:19:41 +00:00
  • 7a5e172b88 Apply a huge part of the decorations and copy Michael Telatynski 2020-01-24 16:16:46 +00:00
  • f51d3b196d Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 15:57:49 +00:00
  • 169ca4a4da Merge pull request #3926 from matrix-org/travis/event-tile-trace Travis Ralston 2020-01-24 08:57:43 -07:00
  • fb32d41b3e Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 15:57:42 +00:00
  • 2445f19431 Merge pull request #12015 from vector-im/travis/user-lists-labs Travis Ralston 2020-01-24 08:57:36 -07:00
  • 72f24b127d Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 15:57:33 +00:00
  • 9722b34c35 Merge pull request #3906 from matrix-org/travis/user-lists-labs Travis Ralston 2020-01-24 08:57:27 -07:00
  • 5ccf5573da Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 15:57:24 +00:00
  • ddafd010ee Merge pull request #3925 from matrix-org/travis/invite-polish Travis Ralston 2020-01-24 08:57:18 -07:00
  • abc2808b62 Fix i18n post-merge Travis Ralston 2020-01-24 08:57:03 -07:00
  • 5f2df15987 Merge branch 'develop' into travis/invite-polish Travis Ralston 2020-01-24 08:56:18 -07:00
  • 72e7ac4a7a Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 15:55:45 +00:00
  • eb2402609a Merge pull request #3871 from matrix-org/travis/qr-verif-rp Travis Ralston 2020-01-24 08:55:40 -07:00
  • 9f3e5ab1db ManageEventIndexDialog: Remove an unused import. Damir Jelić 2020-01-24 16:52:26 +01:00
  • 3208ac60c7 ManageEventIndexDialog: Override the Disable button class to be danger. Damir Jelić 2020-01-24 16:47:29 +01:00
  • 5d3b916a89 DialogButtons: Allow setting the cancel button class with a prop. Damir Jelić 2020-01-24 16:46:46 +01:00
  • cd225943ea EventIndexPanel: Shorten a overly long line. Damir Jelić 2020-01-24 16:22:09 +01:00
  • ddea7415c7 EventIndexPanel: Use formatCountLong to format the event and room counts. Damir Jelić 2020-01-24 16:15:06 +01:00
  • 2d8477aaa6 FormattingUtils: Add a formatCountLong method. Damir Jelić 2020-01-24 16:13:55 +01:00
  • 36b8ab0bf0 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 15:09:36 +00:00
  • 9887ba13b5 Merge pull request #3933 from matrix-org/dbkr/stop_giving_jeff_bezos_all_our_money David Baker 2020-01-24 15:09:31 +00:00
  • 26aaa58e3c Comments are great David Baker 2020-01-24 14:58:46 +00:00
  • b17f38856c More quote failing David Baker 2020-01-24 14:56:00 +00:00
  • de5c47960c quotes David Baker 2020-01-24 14:51:11 +00:00
  • 19c49eedec reskindex for tests David Baker 2020-01-24 14:36:12 +00:00
  • 57ee99d6f7 chmod David Baker 2020-01-24 14:30:41 +00:00
  • 47999c2e46 EventIndexPanel: Add a separate message for the case where Seshat is missing. Damir Jelić 2020-01-24 15:26:54 +01:00
  • 2252f48e04 DisableEventIndexDialog: Use a self-closing tag for the buttons. Damir Jelić 2020-01-24 15:26:24 +01:00
  • 97d55f63a3 DisableEventIndexDialog: Remove the incorrect class on the dialog. Damir Jelić 2020-01-24 15:25:27 +01:00
  • 5536384866 Do less unnecessary work on CI David Baker 2020-01-24 14:21:28 +00:00
  • 4243e2e713 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 14:19:57 +00:00
  • 75f5326db2 Merge pull request #3932 from matrix-org/dbkr/reenable_stylelint David Baker 2020-01-24 14:19:53 +00:00
  • 098d097922 Re-enable stylelint on CI David Baker 2020-01-24 14:03:31 +00:00
  • 5ed599f6d7 Merge branch 'origin/develop' into Weblate. Weblate 2020-01-24 13:54:56 +00:00