Commit Graph

  • c5a6f6390d Translated using Weblate (Norwegian Bokmål) Imre Kristoffer Eilertsen 2020-03-19 01:35:42 +00:00
  • 937a9fe551 Translated using Weblate (Italian) random 2020-03-19 08:50:37 +00:00
  • 2a62c7bdf9 Translated using Weblate (French) Kévin C 2020-03-19 07:21:12 +00:00
  • b49c02709a Translated using Weblate (Finnish) Miro Rauhala 2020-03-19 00:21:52 +00:00
  • b3d447d583 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-19 03:33:34 +00:00
  • 847b96ac67 Translated using Weblate (Basque) Osoitz 2020-03-19 08:12:09 +00:00
  • f0fdd84443 Translated using Weblate (Albanian) Besnik Bleta 2020-03-18 22:08:14 +00:00
  • e946f43ea8 Merge pull request #4231 from matrix-org/t3chguy/kbd Michael Telatynski 2020-03-19 10:46:10 +00:00
  • b675523449 Fix custom tags causing left panel to over-expand Michael Telatynski 2020-03-19 10:45:08 +00:00
  • fa6a937896 don't block onFinished as there are other ways to close modal Michael Telatynski 2020-03-19 09:58:49 +00:00
  • 1dc30beb95 disable textarea when busy Michael Telatynski 2020-03-19 09:58:04 +00:00
  • 3bb1422f93 pre-send megolm keys when possible when a user starts typing Hubert Chathi 2020-03-18 19:23:36 -04:00
  • 8519a83b61 Appease the linter Travis Ralston 2020-03-18 15:58:57 -06:00
  • 2a68479f5a Remove unused strings Travis Ralston 2020-03-18 15:53:05 -06:00
  • 9da57817d1 Use a local wrapper for Jitsi calls Travis Ralston 2020-03-18 15:50:05 -06:00
  • e1eb16ce46 Use a local widget wrapper for Jitsi calls Travis Ralston 2020-03-18 15:47:56 -06:00
  • 016a39c5ca Merge branch 'origin/develop' into Weblate. Weblate 2020-03-18 21:28:30 +00:00
  • a4bee08a18 Translated using Weblate (Norwegian Bokmål) Imre Kristoffer Eilertsen 2020-03-18 15:52:56 +00:00
  • ce90cbe35e Merge pull request #4232 from matrix-org/dbkr/reactsdk-e2e-artifacts-2 David Baker 2020-03-18 21:28:06 +00:00
  • 963c0a7b3f Hide remove target buttons when busy Michael Telatynski 2020-03-18 21:16:41 +00:00
  • dd9ead0166 Invite dialog: backspace on empty field remove right-most target Michael Telatynski 2020-03-18 21:09:52 +00:00
  • 22c8df9f23 Update DM invite copy Michael Telatynski 2020-03-18 21:08:37 +00:00
  • 7a448c5ba2 Fix Alt being Option on Mac Michael Telatynski 2020-03-18 20:56:28 +00:00
  • 544e2c9971 Don't use buildkite agent to upload logs David Baker 2020-03-18 20:53:05 +00:00
  • d593a76f28 Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd Michael Telatynski 2020-03-18 20:41:13 +00:00
  • 1d5001544c Improve colouring Michael Telatynski 2020-03-18 17:32:36 +00:00
  • 36cedc58bb Make ts happier Michael Telatynski 2020-03-18 17:03:00 +00:00
  • 9cda84c675 fix kbd background colour Michael Telatynski 2020-03-18 16:54:46 +00:00
  • cad28c81c0 Add Keyboard shortcuts dialog Michael Telatynski 2020-03-18 16:40:21 +00:00
  • b8e6208cb2 Merge remote-tracking branch 'origin/develop' into uhoreg-uhoreg/symmetric-ssss-migrate David Baker 2020-03-18 14:49:25 +00:00
  • 6b959b4a76 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-18 14:04:05 +00:00
  • f35713bafa Merge branch 'origin/develop' into Weblate. Weblate 2020-03-18 14:04:02 +00:00
  • a99b61a14b Translated using Weblate (Esperanto) Tirifto 2020-03-18 13:56:15 +00:00
  • 7296b704a8 Merge pull request #12756 from vector-im/t3chguy/gemini Michael Telatynski 2020-03-18 14:03:59 +00:00
  • 42ee157645 Merge pull request #4217 from matrix-org/t3chguy/gemini Michael Telatynski 2020-03-18 14:03:51 +00:00
  • d566c3653f Merge branch 'origin/develop' into Weblate. Weblate 2020-03-18 11:51:52 +00:00
  • 863d0206d2 Translated using Weblate (Italian) random 2020-03-18 11:34:52 +00:00
  • ef79492f2c Merge pull request #4209 from matrix-org/t3chguy/redesign/room_directory Michael Telatynski 2020-03-18 11:51:42 +00:00
  • f02a74a449 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-18 11:43:43 +00:00
  • 3a8a5febe9 Translated using Weblate (Welsh) Elwyn Malethan 2020-03-18 11:19:39 +00:00
  • a0fbae0971 Translated using Weblate (Portuguese) Pedro Silva 2020-03-17 23:32:14 +00:00
  • 3b8a34917f Merge pull request #12762 from jaredsmith/patch-1 J. Ryan Stinnett 2020-03-18 11:43:37 +00:00
  • 0c4f0e4fcc Merge branch 'origin/develop' into Weblate. Weblate 2020-03-18 11:33:20 +00:00
  • 5ee2a33faa Translated using Weblate (Welsh) Elwyn Malethan 2020-03-18 11:20:32 +00:00
  • 87cb4a98a7 Translated using Weblate (Occitan) Mejans 2020-03-18 11:17:08 +00:00
  • d5b6392120 Translated using Weblate (Italian) random 2020-03-18 11:31:55 +00:00
  • fafddc9b50 Merge pull request #4110 from aaronraimist/mac-redo David Baker 2020-03-18 11:33:13 +00:00
  • 5808ea2ba1 Add notes about chatting with the team J. Ryan Stinnett 2020-03-18 11:18:29 +00:00
  • e348546e59 Reformat J. Ryan Stinnett 2020-03-18 10:59:46 +00:00
  • 34f3671c09 Add notes on review request handling J. Ryan Stinnett 2020-03-18 10:59:33 +00:00
  • 3989f41985 Clarify merge options J. Ryan Stinnett 2020-03-18 10:23:27 +00:00
  • c30720d71d Merge branch 'origin/develop' into Weblate. Weblate 2020-03-18 10:37:09 +00:00
  • a34e8478d9 Translated using Weblate (Turkish) catborise 2020-03-17 19:52:46 +00:00
  • c43dd8ce92 Translated using Weblate (Portuguese) Pedro Silva 2020-03-17 23:33:15 +00:00
  • 61c3132cc5 Translated using Weblate (Occitan) Mejans 2020-03-17 19:59:51 +00:00
  • 660bbfb2a9 Translated using Weblate (French) Kévin C 2020-03-18 07:48:18 +00:00
  • bc410e0cd2 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-03-18 02:58:53 +00:00
  • dcefcaf175 Merge pull request #4230 from matrix-org/bwindels/fixremovelocalaliaswithlag Bruno Windels 2020-03-18 10:36:57 +00:00
  • bd8b3a9046 Move multi-repo linking to workflow section J. Ryan Stinnett 2020-03-18 10:21:28 +00:00
  • f8c6097c39 remove logging Bruno Windels 2020-03-18 11:18:48 +01:00
  • 1aecc3d7e5 Add multi-repo PR linking J. Ryan Stinnett 2020-03-18 10:18:41 +00:00
  • a366c68c38 Translated using Weblate (Portuguese) Alexis 2020-03-17 23:32:08 +00:00
  • 93059366ab Translated using Weblate (Portuguese) Pedro Silva 2020-03-17 23:20:29 +00:00
  • 7b1b4cda14 ensure local state for aliases doesn't get garbled up Bruno Windels 2020-03-17 20:37:40 +01:00
  • 79eee11673 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-17 19:06:46 +00:00
  • 1453120c66 Merge pull request #4208 from matrix-org/matthew/jump-to-bottom-ublock Travis Ralston 2020-03-17 13:06:41 -06:00
  • 038888f2d4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into mac-redo Aaron Raimist 2020-03-17 13:52:43 -05:00
  • 84a8ca6982 Fix typo Aaron Raimist 2020-03-17 13:18:22 -05:00
  • af023a2d7c rename 'jump to bottom' to avoid ublock block Matthew Hodgson 2020-03-17 11:13:52 -06:00
  • 6b45cdf51e Merge branch 'origin/develop' into Weblate. Weblate 2020-03-17 16:47:23 +00:00
  • fac4561ac8 Merge pull request #4225 from matrix-org/jryans/comp-sec-restore-slow J. Ryan Stinnett 2020-03-17 16:47:18 +00:00
  • 6e4b1f9431 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-17 16:46:59 +00:00
  • e51a7f3ca4 Merge pull request #4223 from matrix-org/jryans/key-backup-text-xsign J. Ryan Stinnett 2020-03-17 16:46:53 +00:00
  • 1219138800 Merge pull request #52 from vector-im/dependabot/npm_and_yarn/minimist-1.2.2 Travis Ralston 2020-03-17 10:40:53 -06:00
  • df9069090f Update electron to v7.1.14 Jared Smith 2020-03-17 10:51:39 -04:00
  • 77c5d55d38 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-17 14:39:19 +00:00
  • a9fbf2f968 Reset matrix-react-sdk back to develop branch RiotRobot 2020-03-17 14:39:09 +00:00
  • 25a3449ad2 Reset matrix-js-sdk back to develop branch RiotRobot 2020-03-17 14:38:58 +00:00
  • 96c7765f5a Merge branch 'origin/develop' into Weblate. Weblate 2020-03-17 14:37:53 +00:00
  • b01c6e67fd Merge branch 'master' into develop RiotRobot 2020-03-17 14:37:28 +00:00
  • c4f3d39d42 v1.5.13 v1.5.13 RiotRobot 2020-03-17 14:31:49 +00:00
  • c84a01310f Prepare changelog for v1.5.13 RiotRobot 2020-03-17 14:31:49 +00:00
  • 61bf0d5447 v1.5.13 RiotRobot 2020-03-17 14:29:28 +00:00
  • 8002bc66d7 Upgrade matrix-react-sdk to 2.2.3 RiotRobot 2020-03-17 14:29:06 +00:00
  • c3553a2649 Upgrade matrix-js-sdk to 5.1.1 RiotRobot 2020-03-17 14:28:23 +00:00
  • 905b8b466e Merge branch 'origin/develop' into Weblate. Weblate 2020-03-17 14:25:54 +00:00
  • b09c063d1b Reset matrix-js-sdk back to develop branch RiotRobot 2020-03-17 14:25:44 +00:00
  • 52b4876189 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-17 14:25:00 +00:00
  • 51012702f2 Translated using Weblate (Albanian) Besnik Bleta 2020-03-17 12:10:30 +00:00
  • 8e8723bb36 Merge branch 'master' into develop RiotRobot 2020-03-17 14:24:35 +00:00
  • a92fe9f846 Merge branch 'release-v2.2.3' RiotRobot 2020-03-17 14:21:35 +00:00
  • 1e3b917aed v2.2.3 RiotRobot 2020-03-17 14:18:15 +00:00
  • 5b96408bc5 Prepare changelog for v2.2.3 RiotRobot 2020-03-17 14:18:14 +00:00
  • 83b6155637 Upgrade matrix-js-sdk to 5.1.1 RiotRobot 2020-03-17 14:12:15 +00:00
  • 638629c2fa fix MyGroups scrollbar Michael Telatynski 2020-03-17 13:28:07 +00:00
  • d72ce28a27 Merge branch 'uhoreg/symmetric-ssss-migrate' of git://github.com/uhoreg/matrix-react-sdk into uhoreg-uhoreg/symmetric-ssss-migrate David Baker 2020-03-17 13:12:05 +00:00
  • 6e90498739 Merge pull request #4228 from matrix-org/jryans/hide-video-config-release J. Ryan Stinnett 2020-03-17 11:56:44 +00:00
  • 9fe8606e01 Merge branch 'origin/develop' into Weblate. Weblate 2020-03-17 11:56:40 +00:00
  • 93b8dee33c Merge pull request #4227 from matrix-org/jryans/hide-video-config J. Ryan Stinnett 2020-03-17 11:56:34 +00:00
  • 8fd3b96b72 fix styling/heights Michael Telatynski 2020-03-17 11:53:19 +00:00