Commit Graph

  • 8c643feb87 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-11 13:52:15 +00:00
  • d67ad473c3 Translated using Weblate (Swedish) LinAGKar 2020-09-11 11:01:47 +00:00
  • ada8b8deec Translated using Weblate (Russian) Nikita Epifanov 2020-09-11 12:39:06 +00:00
  • b1bdb06507 Translated using Weblate (Estonian) Priit Jõerüüt 2020-09-11 11:40:31 +00:00
  • 277aefdd5d Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-09-11 13:09:59 +00:00
  • d53cbecbb1 Merge pull request #5198 from matrix-org/jryans/userinfo-scroll J. Ryan Stinnett 2020-09-11 14:52:06 +01:00
  • 4cd9560d21 Translated using Weblate (Slovak) yuuki-san 2020-09-10 11:39:52 +00:00
  • c88ba8e212 Translated using Weblate (Greek) Salih Emin 2020-09-09 15:21:26 +00:00
  • b633564bea unused import David Baker 2020-09-11 13:02:02 +01:00
  • f14bd05cfb Merge pull request #15153 from vector-im/dependabot/npm_and_yarn/node-fetch-2.6.1 J. Ryan Stinnett 2020-09-11 12:26:32 +01:00
  • e54d4e665f Don't prompt to remove jitsi widget if the user don't have permission David Baker 2020-09-11 12:20:32 +01:00
  • d1aed25815 Bump node-fetch from 2.6.0 to 2.6.1 dependabot[bot] 2020-09-11 11:02:13 +00:00
  • be3a8613ec Fix sticker picker height J. Ryan Stinnett 2020-09-11 11:12:56 +01:00
  • 9549ce5eae Merge branch 'origin/develop' into Weblate. Weblate 2020-09-11 10:45:26 +00:00
  • a56a193c2d Merge pull request #5197 from matrix-org/jryans/stickerpicker-height J. Ryan Stinnett 2020-09-11 11:45:21 +01:00
  • e49a657a90 Fix user info scrolling in new card view J. Ryan Stinnett 2020-09-11 11:39:58 +01:00
  • cd3aa81eed Fix sticker picker height J. Ryan Stinnett 2020-09-11 11:12:56 +01:00
  • ddd12c81a6 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-11 09:27:05 +00:00
  • 19ebc6401f Translated using Weblate (Russian) Nikita Epifanov 2020-09-11 09:08:15 +00:00
  • de8865d844 Merge pull request #5191 from matrix-org/dbkr/jitsi_call_naming David Baker 2020-09-11 10:27:00 +01:00
  • 2af803c1bb remove unused stuff David Baker 2020-09-11 10:17:37 +01:00
  • a93afe8c69 Check jitsi type in proper way David Baker 2020-09-11 09:57:13 +01:00
  • b6f91d76b8 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-11 08:53:15 +00:00
  • 07693b71b1 Merge pull request #5194 from matrix-org/dbkr/dont_unpin_persistent_widgets David Baker 2020-09-11 09:53:09 +01:00
  • b33f7a698b Merge branch 'origin/develop' into Weblate. Weblate 2020-09-11 08:41:46 +00:00
  • e7e6bc93ec Merge pull request #5182 from matrix-org/jryans/defer-cross-signing-setup J. Ryan Stinnett 2020-09-11 09:41:40 +01:00
  • 743c869055 Merge pull request #15137 from vector-im/jryans/remove-travis-refs J. Ryan Stinnett 2020-09-11 09:39:21 +01:00
  • ddcf1e335e Merge branch 'origin/develop' into Weblate. Weblate 2020-09-11 06:29:16 +00:00
  • a700502086 Merge pull request #15127 from vector-im/t3chguy/fix/3543 Michael Telatynski 2020-09-11 07:29:12 +01:00
  • 247e1d431d Merge pull request #5185 from matrix-org/t3chguy/fix/3543 Michael Telatynski 2020-09-11 07:29:10 +01:00
  • cd360ba92f Fix for release Travis Ralston 2020-09-10 13:59:22 -06:00
  • 4cb7381d03 Show verification status in the room summary card Travis Ralston 2020-09-10 13:48:28 -06:00
  • 14f6d9e79f [Release] Show verification status in the room summary card Travis Ralston 2020-09-10 13:48:28 -06:00
  • b7058a33ad lint David Baker 2020-09-10 14:37:44 +01:00
  • eeb4c5696f Don't show 'unpin' for persistent widgets David Baker 2020-09-10 14:30:35 +01:00
  • fa7eaedaa7 Merge pull request #15136 from vector-im/jryans/langs-2020-09 J. Ryan Stinnett 2020-09-10 14:28:27 +01:00
  • 18be4cb202 Use widget type fromString David Baker 2020-09-10 14:18:49 +01:00
  • 96080f2ccc Prompt to remove the jitsi widget when pressing the call button David Baker 2020-09-10 14:06:13 +01:00
  • 0c0d014e4f Merge branch 'origin/develop' into Weblate. Weblate 2020-09-10 12:58:19 +00:00
  • 7d3e0ed9ce Translated using Weblate (Swedish) LinAGKar 2020-09-10 08:01:58 +00:00
  • 8d4a252184 Translated using Weblate (Slovak) yuuki-san 2020-09-10 11:43:18 +00:00
  • 9c749626e4 Translated using Weblate (Hungarian) Szimszon 2020-09-10 09:47:42 +00:00
  • c5bf61e270 Translated using Weblate (Galician) XoseM 2020-09-10 05:43:54 +00:00
  • 7f1c5537fb Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-09-10 01:39:02 +00:00
  • 17a6f33b91 Translated using Weblate (Albanian) Besnik Bleta 2020-09-10 08:41:25 +00:00
  • 017765df24 Merge pull request #5192 from matrix-org/matthew/badge-counts Matthew Hodgson 2020-09-10 13:58:07 +01:00
  • 5ecc3f4398 kill formatMinimalBadgeCount entirely Matthew Hodgson 2020-09-10 13:56:46 +01:00
  • 89d05ac952 bring back 1.2M style badge counts rather than 99+ Matthew Hodgson 2020-09-10 13:51:34 +01:00
  • 2b965a2741 Call jitsi widgets 'group calls' David Baker 2020-09-10 11:52:01 +01:00
  • 7262b372b3 Remove references to Travis CI J. Ryan Stinnett 2020-09-10 10:14:43 +01:00
  • 6853cabca2 Enable Estonian in language menu J. Ryan Stinnett 2020-09-10 10:03:13 +01:00
  • f8324c0dc0 Merge pull request #5190 from matrix-org/travis/permalinks-release-fix Travis Ralston 2020-09-09 15:20:49 -06:00
  • a9ee1e785e Merge branch 'origin/develop' into Weblate. Weblate 2020-09-09 21:08:50 +00:00
  • 188aee0fcf Translated using Weblate (Russian) Nikita Epifanov 2020-09-09 15:13:51 +00:00
  • 884b54fd02 Translated using Weblate (German) @a2sc:matrix.org 2020-09-09 14:56:29 +00:00
  • 9586a981de Translated using Weblate (Estonian) Priit Jõerüüt 2020-09-09 15:36:43 +00:00
  • a765db8977 Merge pull request #5189 from matrix-org/travis/rageshake-fix Travis Ralston 2020-09-09 15:08:43 -06:00
  • 3973efeed3 [Release] Account for via in pill matching regex Travis Ralston 2020-09-09 14:35:17 -06:00
  • c61f2a8099 Merge pull request #5188 from matrix-org/travis/permalink-pills Travis Ralston 2020-09-09 14:55:58 -06:00
  • 77f715ba73 Fix i18n and analytics Travis Ralston 2020-09-09 14:55:27 -06:00
  • 9b5823cccb Run the rageshake command through the bug report dialog Travis Ralston 2020-09-09 14:53:38 -06:00
  • 0a7090dd64 Account for via in pill matching regex Travis Ralston 2020-09-09 14:35:17 -06:00
  • 91282e8071 Merge pull request #5187 from matrix-org/travis/fix-lock Travis Ralston 2020-09-09 13:15:11 -06:00
  • 85b5b8b094 Remove now-unused create-react-class from lockfile Travis Ralston 2020-09-09 13:10:27 -06:00
  • 1b38b4cc00 Merge pull request #5163 from nigelrudolf/develop Michael Telatynski 2020-09-09 17:49:08 +01:00
  • 050319c0cc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-1px-jump Michael Telatynski 2020-09-09 17:37:50 +01:00
  • ac447fd318 Fix onNewScreen to use replace when going from roomId->roomAlias to prevent locking the user in place Michael Telatynski 2020-09-09 16:52:48 +01:00
  • c26f3b8a97 Fix onNewScreen to use replace when going from roomId->roomAlias to prevent locking the user in place Michael Telatynski 2020-09-09 16:52:46 +01:00
  • cf448f1f0a v1.7.6-rc.1 v1.7.6-rc.1 RiotRobot 2020-09-09 16:00:06 +01:00
  • ff2fe80537 Prepare changelog for v1.7.6-rc.1 RiotRobot 2020-09-09 16:00:06 +01:00
  • 3a3b9641e9 v1.7.6-rc.1 RiotRobot 2020-09-09 15:59:31 +01:00
  • 6e9407e7c1 Prepare changelog for v1.7.6-rc.1 RiotRobot 2020-09-09 15:59:31 +01:00
  • 2ad02e4feb Upgrade matrix-react-sdk to 3.4.0-rc.1 RiotRobot 2020-09-09 15:56:58 +01:00
  • fcdda7a956 Upgrade matrix-js-sdk to 8.3.0-rc.1 RiotRobot 2020-09-09 15:56:42 +01:00
  • c5e033d81a v3.4.0-rc.1 RiotRobot 2020-09-09 15:53:04 +01:00
  • 53ca12a0b2 Prepare changelog for v3.4.0-rc.1 RiotRobot 2020-09-09 15:53:04 +01:00
  • 62556c2afe Merge pull request #5184 from matrix-org/dbkr/always_allow_local_widgets David Baker 2020-09-09 15:52:31 +01:00
  • f9079975a1 write correct jsdoc David Baker 2020-09-09 15:42:25 +01:00
  • 99b0a0a78e Always allow widgets when using the local version David Baker 2020-09-09 15:35:05 +01:00
  • da9f765af8 Merge pull request #5175 from matrix-org/t3chguy/dpsah/6785.3 Michael Telatynski 2020-09-09 15:27:40 +01:00
  • a1f1334250 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.3 Michael Telatynski 2020-09-09 15:16:19 +01:00
  • cc353dbe43 Upgrade matrix-js-sdk to 8.3.0-rc.1 RiotRobot 2020-09-09 15:13:40 +01:00
  • 7d3c203464 Merge pull request #140 from vector-im/jryans/electron-10.1.1 J. Ryan Stinnett 2020-09-09 15:10:26 +01:00
  • e9b4fb2245 Upgrade to Electron 10.1.1 J. Ryan Stinnett 2020-09-09 14:57:09 +01:00
  • eaa46d1794 Merge pull request #15125 from RiotTranslateBot/weblate-element-web-element-web J. Ryan Stinnett 2020-09-09 14:44:18 +01:00
  • 0573ab1443 Merge pull request #5183 from RiotTranslateBot/weblate-element-web-matrix-react-sdk J. Ryan Stinnett 2020-09-09 14:44:04 +01:00
  • 0f633d922e Merge branch 'origin/develop' into Weblate. Weblate 2020-09-09 13:37:52 +00:00
  • 5a5be814b6 Translated using Weblate (Spanish) TERMICO 2020-09-08 14:29:25 +00:00
  • bbfbef7f24 Translated using Weblate (German) riverside6 2020-09-08 19:00:56 +00:00
  • db5cbdf709 Merge branch 'origin/develop' into Weblate. Weblate 2020-09-09 13:34:36 +00:00
  • 3aeac749b3 Merge pull request #5167 from matrix-org/t3chguy/dpsah/6785.1 Michael Telatynski 2020-09-09 14:34:31 +01:00
  • 0219824d6f Merge remote-tracking branch 'origin/develop' into jryans/defer-cross-signing-setup J. Ryan Stinnett 2020-09-09 14:13:23 +01:00
  • 6d1b1d9460 Fix linting error J. Ryan Stinnett 2020-09-09 14:12:36 +01:00
  • 04d2f93902 Fix WidgetStore handler bindings Michael Telatynski 2020-09-09 13:15:19 +01:00
  • 0e58eb6d56 Update initial widget height Michael Telatynski 2020-09-09 13:15:07 +01:00
  • cef533b83e Update ellipsis svg Michael Telatynski 2020-09-09 13:09:21 +01:00
  • 39a59dbefa fix CI some more Michael Telatynski 2020-09-09 12:59:41 +01:00
  • d9e17e89b5 fix CI Michael Telatynski 2020-09-09 12:55:16 +01:00
  • 8d66dce68d Update copy and use svg for ellipsis Michael Telatynski 2020-09-09 12:50:48 +01:00
  • b635598bc3 Attempt to fix tests and fix RoomSummaryCard having wrong member count Michael Telatynski 2020-09-09 12:28:12 +01:00