Commit Graph

  • c636dc0ed3 Fix custom tag layout which regressed in #5309 Aaron Raimist 2020-10-29 16:54:47 -05:00
  • f828c6d494 Implement call hold David Baker 2020-10-29 17:56:24 +00:00
  • c3a355097d Initial Countly work Michael Telatynski 2020-10-29 15:53:14 +00:00
  • 3f9f1d03c8 stubbed isGuest for unit tests Aleks Kissinger 2020-10-29 13:22:09 +00:00
  • 0b7ec2d734 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-29 11:54:57 +00:00
  • 3c9cc636c4 Merge pull request #5360 from matrix-org/t3chguy/fix/15586 Michael Telatynski 2020-10-29 11:54:49 +00:00
  • 9c3325fb67 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-29 03:18:34 +00:00
  • 8269ca74de Merge branch 'origin/develop' into Weblate. Weblate 2020-10-29 03:18:29 +00:00
  • c4e8b4221f Translated using Weblate (Lithuanian) MamasLT 2020-10-28 14:43:42 +00:00
  • 56761020bb Merge pull request #15592 from vector-im/travis/ui-feat/history Travis Ralston 2020-10-28 21:18:25 -06:00
  • ac3414b231 Merge pull request #5362 from matrix-org/travis/ui-feat/history Travis Ralston 2020-10-28 21:18:19 -06:00
  • 24ba566877 Specify community description img must be mxc urls Matthew Kenigsberg 2020-10-28 18:34:04 -05:00
  • 09b02d0120 Fix i18n Travis Ralston 2020-10-28 10:50:38 -06:00
  • 6b31c14c97 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-28 15:27:07 +00:00
  • 67d82f2695 Merge remote-tracking branch 'origin/develop' into develop RiotRobot 2020-10-28 15:26:41 +00:00
  • 35327ff6a4 Reset matrix-react-sdk back to develop branch RiotRobot 2020-10-28 15:24:23 +00:00
  • a3fdb1c2a2 Reset matrix-js-sdk back to develop branch RiotRobot 2020-10-28 15:24:11 +00:00
  • 98acd1b059 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-28 15:23:45 +00:00
  • 4bff37b16c Merge pull request #15590 from vector-im/jryans/rename-docker-repo J. Ryan Stinnett 2020-10-28 15:23:38 +00:00
  • 098d8b154b Merge branch 'master' into develop RiotRobot 2020-10-28 15:22:24 +00:00
  • cc7e64375d v1.7.12 v1.7.12 origin/release-v1.7.12 RiotRobot 2020-10-28 15:18:19 +00:00
  • 9d6bbef04e Prepare changelog for v1.7.12 RiotRobot 2020-10-28 15:18:19 +00:00
  • f821b7c8bb Upgrade matrix-react-sdk to 3.7.1 RiotRobot 2020-10-28 15:13:55 +00:00
  • 469df236d9 Upgrade matrix-js-sdk to 9.0.1 RiotRobot 2020-10-28 15:13:31 +00:00
  • 4957e9e24f v1.7.12 RiotRobot 2020-10-28 15:12:32 +00:00
  • 7be314caf8 Prepare changelog for v1.7.12 RiotRobot 2020-10-28 15:12:32 +00:00
  • a501d698aa Add a UI Feature flag for room history settings Travis Ralston 2020-10-27 19:20:25 -06:00
  • e2aeca1580 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-28 14:33:30 +00:00
  • a708dbf6e9 Reset matrix-js-sdk back to develop branch RiotRobot 2020-10-28 14:32:26 +00:00
  • d64639c70a Rename Docker repo in docs J. Ryan Stinnett 2020-10-28 14:32:25 +00:00
  • 6233df9d70 Merge branch 'master' into develop RiotRobot 2020-10-28 14:31:19 +00:00
  • bdfac1d858 v3.7.1 RiotRobot 2020-10-28 14:25:35 +00:00
  • 6c7284afba Prepare changelog for v3.7.1 RiotRobot 2020-10-28 14:25:34 +00:00
  • de6589705c Upgrade matrix-js-sdk to 9.0.1 RiotRobot 2020-10-28 14:17:48 +00:00
  • 35a28a3f46 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-28 14:17:06 +00:00
  • e1e77b2191 Merge pull request #5361 from matrix-org/jryans/hide-inline-images J. Ryan Stinnett 2020-10-28 14:16:57 +00:00
  • 5f840da38a Fix typo J. Ryan Stinnett 2020-10-28 13:12:12 +00:00
  • ac7991c494 Add comment J. Ryan Stinnett 2020-10-28 13:11:35 +00:00
  • 9c8bc583e0 Hide inline images when preference disabled J. Ryan Stinnett 2020-10-28 13:03:48 +00:00
  • e06550b748 Watch replyToEvent at RoomView to prevent races Michael Telatynski 2020-10-28 12:47:59 +00:00
  • c964c38406 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-28 11:27:16 +00:00
  • 557d9ad90c Merge pull request #5359 from matrix-org/jryans/react-key-checkboxes J. Ryan Stinnett 2020-10-28 11:27:07 +00:00
  • 71206e8e3d Add documentation for new UIFeature flag regarding room history settings Travis Ralston 2020-10-27 19:23:06 -06:00
  • f5480efea7 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-28 00:56:38 +00:00
  • 89fbd33abf Translated using Weblate (Esperanto) Tirifto 2020-10-27 22:04:12 +00:00
  • 0adb920448 Merge pull request #5352 from matrix-org/hs/mvideobody Travis Ralston 2020-10-27 18:56:29 -06:00
  • 6dc709a045 😅 Resynth 2020-10-27 20:10:23 +00:00
  • bb18e44042 Fix React warning by moving handler to each button J. Ryan Stinnett 2020-10-27 17:11:07 +00:00
  • a093a64d70 Merge pull request #5358 from matrix-org/t3chguy/fix/jitsi-cherry-pick Michael Telatynski 2020-10-27 12:05:13 +00:00
  • ce44cbb2dc Merge pull request #15577 from vector-im/t3chguy/fix/jitsi-cherry-pick origin/release-v1.7.11 Michael Telatynski 2020-10-27 12:05:09 +00:00
  • 2fb0525756 Fix theme variable passed to Jitsi Michael Telatynski 2020-10-27 11:13:55 +00:00
  • be1e4552aa fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through Michael Telatynski 2020-10-27 11:24:52 +00:00
  • d297ee5c7e Fix theme variable handling with invalid values Michael Telatynski 2020-10-27 11:13:55 +00:00
  • 9e3f3415bb Merge branch 'origin/develop' into Weblate. Weblate 2020-10-27 11:39:07 +00:00
  • da00ab53ad Translated using Weblate (Lithuanian) MamasLT 2020-10-26 22:25:34 +00:00
  • fdb491d4e8 Translated using Weblate (Swedish) LinAGKar 2020-10-26 18:27:35 +00:00
  • 1214052e53 Translated using Weblate (Hungarian) notramo 2020-10-26 18:55:37 +00:00
  • 432deb665d Translated using Weblate (French) Corentin Noël 2020-10-26 21:34:41 +00:00
  • b9a7531926 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-27 11:38:34 +00:00
  • 5de910a9eb Translated using Weblate (Dutch) DO4TQe1jcGNLk9GvtDKqismfsIht20JBP7bps1OzQnvTDSwYSN 2020-10-27 00:04:51 +00:00
  • 914699259b Merge pull request #5357 from matrix-org/t3chguy/fix/jitsi Michael Telatynski 2020-10-27 11:38:30 +00:00
  • dda3779ad8 Merge pull request #15575 from vector-im/t3chguy/fix/jitsi Michael Telatynski 2020-10-27 11:38:26 +00:00
  • 0bdf979c46 fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through Michael Telatynski 2020-10-27 11:24:52 +00:00
  • 7c895bd8c0 Fix theme variable handling with invalid values Michael Telatynski 2020-10-27 11:13:55 +00:00
  • 17717e27c6 Fix theme variable passed to Jitsi Michael Telatynski 2020-10-27 11:13:55 +00:00
  • cb510f7d74 Merge pull request #5351 from matrix-org/t3chguy/cherry-pick/6 Michael Telatynski 2020-10-27 11:15:53 +00:00
  • a3212c0477 Fix weird formatting Resynth 2020-10-26 23:46:53 +00:00
  • dc28616a6f Remove empty CSS block Resynth 2020-10-26 22:53:37 +00:00
  • 2b0ec9eb2f v1.7.11 RiotRobot 2020-10-26 17:24:28 +00:00
  • 5220abbfd4 Prepare changelog for v1.7.11 RiotRobot 2020-10-26 17:24:28 +00:00
  • fe98a8b0c2 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-26 17:22:32 +00:00
  • 90d5c202c6 Reset matrix-react-sdk back to develop branch RiotRobot 2020-10-26 17:22:22 +00:00
  • d8a7af0e7e Reset matrix-js-sdk back to develop branch RiotRobot 2020-10-26 17:22:11 +00:00
  • 7fe1acfd91 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-26 17:22:09 +00:00
  • e9b7b36c87 Translated using Weblate (Greek) John 2020-10-25 16:55:33 +00:00
  • 6cef14e6cc v1.7.11 v1.7.11 RiotRobot 2020-10-26 17:19:01 +00:00
  • 212e4f831f Prepare changelog for v1.7.11 RiotRobot 2020-10-26 17:19:00 +00:00
  • 059366f07a Upgrade matrix-react-sdk to 3.7.0 RiotRobot 2020-10-26 17:00:07 +00:00
  • 40384ffe42 Upgrade matrix-js-sdk to 9.0.0 RiotRobot 2020-10-26 16:58:20 +00:00
  • 9c82482b85 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-26 16:57:34 +00:00
  • 6f37875d38 Reset matrix-js-sdk back to develop branch RiotRobot 2020-10-26 16:57:24 +00:00
  • 361732612e Merge branch 'origin/develop' into Weblate. Weblate 2020-10-26 16:56:57 +00:00
  • 40881a7359 Translated using Weblate (Lithuanian) MamasLT 2020-10-26 15:54:37 +00:00
  • 1f2ff33fc8 Merge branch 'master' into develop RiotRobot 2020-10-26 16:56:37 +00:00
  • 492f85da00 v3.7.0 RiotRobot 2020-10-26 16:55:16 +00:00
  • 25dd5e045e Prepare changelog for v3.7.0 RiotRobot 2020-10-26 16:55:16 +00:00
  • 5446184e6e Upgrade matrix-js-sdk to 9.0.0 RiotRobot 2020-10-26 16:49:16 +00:00
  • 19395f3c3c null checks added nurjinn jafar 2020-10-26 16:37:45 +01:00
  • 734916ad98 Merge branch 'origin/develop' into Weblate. Weblate 2020-10-26 14:49:10 +00:00
  • 2beeb493b7 Translated using Weblate (Estonian) Priit Jõerüüt 2020-10-23 21:02:24 +00:00
  • 5555931afa Translated using Weblate (Lithuanian) MamasLT 2020-10-26 14:48:49 +00:00
  • 159d4ac973 Translated using Weblate (Galician) XoseM 2020-10-24 03:37:54 +00:00
  • 72d7760ed2 Translated using Weblate (Norwegian Bokmål) Dominik George 2020-10-23 14:58:29 +00:00
  • 7cab8a37b9 Translated using Weblate (Esperanto) Tirifto 2020-10-25 20:56:46 +00:00
  • 0ff396e9ec Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-10-25 12:44:21 +00:00
  • ed250b0abf Translated using Weblate (Russian) Nikita Epifanov 2020-10-25 11:17:45 +00:00
  • 5ab899fda6 Translated using Weblate (Russian) progserega 2020-10-25 11:21:57 +00:00
  • d3840438a9 Translated using Weblate (Portuguese (Brazil)) Marcelo Filho 2020-10-23 14:52:34 +00:00
  • 4e3e752287 Translated using Weblate (Hungarian) Szimszon 2020-10-24 18:12:54 +00:00
  • 7460e4cd66 Translated using Weblate (German) aWeinzierl 2020-10-25 12:42:11 +00:00