Commit Graph

  • 6b9dfa37c5 Migrate UnknownBody to TypeScript Germain Souquet 2021-06-30 09:00:14 +01:00
  • d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 Germain Souquet 2021-06-30 08:58:05 +01:00
  • fdced3da1b Remove reminescent references to the tinter Germain Souquet 2021-06-30 08:09:55 +01:00
  • 551639811b Merge and resolve conflicts Jaiwanth 2021-06-30 12:29:13 +05:30
  • f50604db78 missing semicolon Jaiwanth 2021-06-30 12:13:39 +05:30
  • a99b24ef83 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room Jaiwanth 2021-06-30 11:20:01 +05:30
  • 1b21c8f732 Remove unreadRoomId from summarized notification state Jaiwanth 2021-06-30 10:53:46 +05:30
  • b2292268bc Update src/components/views/voip/CallView.tsx pvagner 2021-06-30 07:06:10 +02:00
  • 7d5db4689c Disable close icon during export Jaiwanth 2021-06-30 10:03:33 +05:30
  • 2021650d77 Merge branch 'develop' into watch-show-timestamps Robin Townsend 2021-06-29 22:43:46 -04:00
  • c0e10218d9 Fix lints Robin Townsend 2021-06-29 22:42:46 -04:00
  • adb5df52a4 Merge branch 'develop' into text-for-event-perf Robin Townsend 2021-06-29 22:13:18 -04:00
  • 29904a7ffc Merge pull request #6263 from matrix-org/t3chguy/ts/4 Michael Telatynski 2021-06-29 22:31:16 +01:00
  • 3fa89f3294 Merge pull request #6243 from matrix-org/t3chguy/ts/8 Michael Telatynski 2021-06-29 22:27:16 +01:00
  • 6250d9ba61 Merge branch 'develop' into t3chguy/ts/4 Michael Telatynski 2021-06-29 22:24:47 +01:00
  • 4bc53aaed1 Merge pull request #17647 from vector-im/t3chguy/fix/17282 Michael Telatynski 2021-06-29 22:23:49 +01:00
  • a59e94b907 delint Michael Telatynski 2021-06-29 22:21:05 +01:00
  • 8f4879ea96 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 Michael Telatynski 2021-06-29 22:14:40 +01:00
  • 46f59be7f3 Merge branch 'develop' into voip-a11y Peter Vágner 2021-06-29 23:08:13 +02:00
  • 9d6d8fc666 Merge pull request #6285 from matrix-org/jryans/rework-linting-2 J. Ryan Stinnett 2021-06-29 17:45:10 +01:00
  • 55121f6e81 Merge pull request #6287 from matrix-org/gsouquet/fix-17836 Germain 2021-06-29 17:23:13 +01:00
  • d035151116 Avoid cyclic dependencies by moving watchers out of constructor Germain Souquet 2021-06-29 17:04:51 +01:00
  • 4ba0e6bdee Merge pull request #17818 from vector-im/gsouquet/fix-6162 Germain 2021-06-29 15:33:32 +01:00
  • 9a37f29841 Merge pull request #6284 from matrix-org/gsouquet/fix-17826 Germain 2021-06-29 15:32:14 +01:00
  • 07f057f381 Keep indent rule enabled J. Ryan Stinnett 2021-06-29 15:30:38 +01:00
  • 782e793925 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 J. Ryan Stinnett 2021-06-29 15:27:24 +01:00
  • 21b8c81eb8 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 J. Ryan Stinnett 2021-06-29 15:25:30 +01:00
  • 623317cd47 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8 Michael Telatynski 2021-06-29 15:22:54 +01:00
  • 640fc591bb Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter Germain 2021-06-29 15:22:48 +01:00
  • 78f1748634 Merge pull request #6283 from matrix-org/gsouquet/filepanel-typescript Germain 2021-06-29 15:15:29 +01:00
  • b0be7d2861 Add license and negate the conditional Jaiwanth 2021-06-29 19:43:21 +05:30
  • 8f8202494a v1.7.32-rc.1 v1.7.32-rc.1 RiotRobot 2021-06-29 14:50:34 +01:00
  • 27c7030034 Prepare changelog for v1.7.32-rc.1 RiotRobot 2021-06-29 14:50:33 +01:00
  • 3326242915 Upgrade matrix-react-sdk to 3.25.0-rc.1 RiotRobot 2021-06-29 14:47:35 +01:00
  • c4ba5ce02a Upgrade matrix-js-sdk to 12.0.1-rc.1 RiotRobot 2021-06-29 14:47:16 +01:00
  • a48d453be1 v3.25.0-rc.1 RiotRobot 2021-06-29 14:43:01 +01:00
  • 70fc518667 Prepare changelog for v3.25.0-rc.1 RiotRobot 2021-06-29 14:43:00 +01:00
  • 18407fbce9 Upgrade matrix-js-sdk to 12.0.1-rc.1 RiotRobot 2021-06-29 14:36:24 +01:00
  • 744050d8f4 Electron 12.0.12 David Baker 2021-06-29 14:16:52 +01:00
  • 38e5ac787c Merge pull request #6286 from RiotTranslateBot/weblate-element-web-matrix-react-sdk David Baker 2021-06-29 14:15:00 +01:00
  • 6110e3df14 Merge pull request #17832 from RiotTranslateBot/weblate-element-web-element-web David Baker 2021-06-29 14:14:51 +01:00
  • 39f3e3b9c2 Merge pull request #220 from RiotTranslateBot/weblate-element-desktop-element-desktop David Baker 2021-06-29 14:14:43 +01:00
  • 43c8b13d75 Merge branch 'origin/develop' into Weblate. Weblate 2021-06-29 13:08:43 +00:00
  • d68fa223bc Translated using Weblate (Lithuanian) Govindas 2021-06-29 13:08:18 +00:00
  • 0b4cb9af54 Merge branch 'origin/develop' into Weblate. Weblate 2021-06-29 13:02:29 +00:00
  • 8d79a10135 Translated using Weblate (Estonian) Priit Jõerüüt 2021-06-27 19:25:41 +00:00
  • 7df42b1bdb Translated using Weblate (Lithuanian) Govindas 2021-06-29 12:41:06 +00:00
  • f35fe7c57f Translated using Weblate (German) libexus 2021-06-27 10:00:40 +00:00
  • d626f16da4 Merge branch 'origin/develop' into Weblate. Weblate 2021-06-29 13:00:57 +00:00
  • 0551becafd Fix long lines J. Ryan Stinnett 2021-06-29 13:42:19 +01:00
  • fe123fc605 Rework lint comments J. Ryan Stinnett 2021-06-29 13:35:43 +01:00
  • bbdd93f592 Auto-fix more errors J. Ryan Stinnett 2021-06-29 13:26:09 +01:00
  • b501665971 Fix parsing errors J. Ryan Stinnett 2021-06-29 13:23:13 +01:00
  • 2be40ad08a Use unquoted keys J. Ryan Stinnett 2021-06-29 13:19:42 +01:00
  • a4f8ca4f8a Switch to newer Babel specific config J. Ryan Stinnett 2021-06-29 13:18:58 +01:00
  • ae0a8b8da4 Auto-fix lint errors J. Ryan Stinnett 2021-06-29 13:11:58 +01:00
  • 4c5720a573 Update lint comments J. Ryan Stinnett 2021-04-01 13:26:00 +01:00
  • 71116bfa27 Migrate to eslint-plugin-matrix-org J. Ryan Stinnett 2021-04-01 13:17:09 +01:00
  • 2d3163fef5 Remove Flow support J. Ryan Stinnett 2021-03-12 15:49:47 +00:00
  • 88cd5aeaf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 Michael Telatynski 2021-06-29 12:26:55 +01:00
  • db015519ed Code style changes for FilePanel Germain Souquet 2021-06-29 12:18:41 +01:00
  • 56e05041fd Import curly spaces Germain 2021-06-29 12:13:41 +01:00
  • 4cfdad8aa2 Add spacing between toast buttons with cross browser support in mind Germain Souquet 2021-06-29 11:59:13 +01:00
  • 2d568f9688 iterate ts support Michael Telatynski 2021-06-29 11:41:08 +01:00
  • 652f57371a Migrate FilePanel to TypeScript Germain Souquet 2021-06-29 11:38:19 +01:00
  • b70297c510 Merge pull request #6277 from matrix-org/t3chguy/fix/17793 Michael Telatynski 2021-06-29 10:55:53 +01:00
  • b60c2c5d55 Fix e2e test right panel back behaviour Michael Telatynski 2021-06-29 10:37:30 +01:00
  • 14ef38e057 Merge pull request #6280 from robintown/group-acls J. Ryan Stinnett 2021-06-29 10:02:12 +01:00
  • 746b11b24d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room Jaiwanth 2021-06-29 14:31:08 +05:30
  • 0cc7f42f08 Merge pull request #6282 from matrix-org/t3chguy/fix/17738 Michael Telatynski 2021-06-29 09:14:17 +01:00
  • 497d8102e2 Handle mxc urls for non-encrypted rooms Jaiwanth 2021-06-29 12:54:44 +05:30
  • 26592da09f Merge pull request #5671 from weeman1337/msg-context-menu Michael Telatynski 2021-06-29 08:18:07 +01:00
  • 298bf30b18 Fix editState not getting passed through Michael Telatynski 2021-06-29 08:16:43 +01:00
  • 747273cc9c Convert input's value to string to use existing types Jaiwanth 2021-06-29 12:06:58 +05:30
  • 3fc4be0be9 Add return types to ABC Exporter Jaiwanth 2021-06-29 11:40:26 +05:30
  • 637e3afa48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations Jaiwanth 2021-06-29 11:31:30 +05:30
  • 6cbbc0ecb4 Replace hard coded forExport string by mxc url Jaiwanth 2021-06-29 11:29:05 +05:30
  • e404fa3cae Apply suggestions Jaiwanth 2021-06-29 10:57:02 +05:30
  • 025a7eb9a5 Iterate PR Jaiwanth 2021-06-29 10:36:24 +05:30
  • de6bc3f2ed Update src/utils/exportUtils/Exporter.ts Jaiwanth 2021-06-29 10:19:57 +05:30
  • b506de0989 Update src/components/views/messages/MFileBody.js Jaiwanth 2021-06-29 10:19:11 +05:30
  • 60c6af501b Update src/components/views/dialogs/ExportDialog.tsx Jaiwanth 2021-06-29 10:18:17 +05:30
  • 7a09bcb5a2 Update src/components/views/dialogs/ExportDialog.tsx Jaiwanth 2021-06-29 10:17:38 +05:30
  • e459f3841d Update src/components/views/dialogs/ExportDialog.tsx Jaiwanth 2021-06-29 10:17:14 +05:30
  • a92ddb3f27 Update src/components/views/dialogs/ExportDialog.tsx Jaiwanth 2021-06-29 10:16:32 +05:30
  • 7bbfaed500 Update src/components/views/dialogs/ExportDialog.tsx Jaiwanth 2021-06-29 10:16:08 +05:30
  • b626a3d5cb Update src/components/views/dialogs/ExportDialog.tsx Jaiwanth 2021-06-29 10:15:46 +05:30
  • 7a5aea1441 Update src/components/views/dialogs/ExportDialog.tsx Jaiwanth 2021-06-29 10:15:20 +05:30
  • 1014e9ea48 Update src/components/views/dialogs/ExportDialog.tsx Jaiwanth 2021-06-29 10:14:56 +05:30
  • 7b683a1f64 Update src/components/views/dialogs/ExportDialog.tsx Jaiwanth 2021-06-29 10:14:24 +05:30
  • efccf19e9e Update src/utils/exportUtils/exportUtils.ts Jaiwanth 2021-06-29 10:14:00 +05:30
  • e6cb0666ef Update src/utils/exportUtils/exportUtils.ts Jaiwanth 2021-06-29 10:13:51 +05:30
  • 4ddbe76fbd Update src/components/views/dialogs/ExportDialog.tsx Jaiwanth 2021-06-29 10:13:38 +05:30
  • f0d0b77b8c Update src/TextForEvent.tsx Jaiwanth 2021-06-29 10:13:14 +05:30
  • 734dbae248 Merge branch 'develop' into string-pl Aaron Raimist 2021-06-28 22:49:13 -05:00
  • 434b313850 Merge branch 'develop' into string-pl Aaron Raimist 2021-06-28 22:13:51 -05:00
  • 7a4ceec985 Restore clamped dimensions on voice recorder waveform Travis Ralston 2021-06-28 21:02:42 -06:00
  • d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240 Travis Ralston 2021-06-28 21:00:36 -06:00
  • 964a97d59e Merge remote-tracking branch 'origin/develop' into travis/new-audio Travis Ralston 2021-06-28 20:52:44 -06:00
  • b6d9ecde8b Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf Travis Ralston 2021-06-28 20:49:21 -06:00