Commit Graph

  • 1fc5138cfe Convert AppPermission to TS Šimon Brandner 2021-07-20 12:19:00 +02:00
  • f913f0ee19 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-20 10:23:41 +00:00
  • 770de8f6b5 Merge pull request #6408 from matrix-org/t3chguy/eslint Michael Telatynski 2021-07-20 11:23:36 +01:00
  • 596fb774e3 Remove sdk.getComponent instructions Germain Souquet 2021-07-20 12:22:32 +02:00
  • b94886a291 i18n irc and fix lint from merge conflict Michael Telatynski 2021-07-20 11:18:27 +01:00
  • 1c6aa25070 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-20 10:16:58 +00:00
  • 364bee9ebd Merge pull request #6414 from matrix-org/gsouquet/fix-jsx-coma J. Ryan Stinnett 2021-07-20 11:16:54 +01:00
  • 48949af961 Improve typing Šimon Brandner 2021-07-20 12:16:17 +02:00
  • 93ab4dc787 UserAddressType -> IUserAddress Šimon Brandner 2021-07-20 12:03:21 +02:00
  • d3934ff7da Merge branch 'develop' into t3chguy/eslint Michael Telatynski 2021-07-20 11:08:13 +01:00
  • e38682d75c Remove unwanted coma in EventTile Germain Souquet 2021-07-20 12:05:18 +02:00
  • a747bbbae7 Convert AddressPickerDialog to TS Šimon Brandner 2021-07-20 11:26:33 +02:00
  • 156901ce62 Convert AddressTile to TS Šimon Brandner 2021-07-20 11:19:29 +02:00
  • 28871ee07d Convert AddressSelector to TS Šimon Brandner 2021-07-20 11:04:29 +02:00
  • 8bbd91547d Convert ActionButton to TS Šimon Brandner 2021-07-20 10:59:34 +02:00
  • 9fe9534e01 fix three lints Michael Telatynski 2021-07-20 10:33:52 +01:00
  • e3897fb978 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-20 09:22:50 +00:00
  • 96ab4fd022 Translated using Weblate (German) René-Maximilian Malsky 2021-07-20 08:54:37 +00:00
  • 53ae7817bc Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635 Germain 2021-07-20 10:22:41 +01:00
  • dd65d47fba lint fix Germain Souquet 2021-07-20 11:12:17 +02:00
  • fba49186ed Merge branch 'develop' into t3chguy/eslint Michael Telatynski 2021-07-20 09:44:04 +01:00
  • 848b83015d not sure how these happened :/ Michael Telatynski 2021-07-20 09:37:54 +01:00
  • e6869797d7 remove unused prop Michael Telatynski 2021-07-20 09:27:32 +01:00
  • 4b5b0e9244 delint Michael Telatynski 2021-07-20 09:27:12 +01:00
  • 3e69d1ec63 Merge pull request #237 from vector-im/t3chguy/eslint Michael Telatynski 2021-07-20 09:18:42 +01:00
  • 98aa1fe6b3 Move @types/streamsaver to devDependencies Jaiwanth 2021-07-20 13:47:51 +05:30
  • 06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 Germain Souquet 2021-07-20 10:16:21 +02:00
  • 7cde32ed2e Update eslint-plugin-matrix-org Michael Telatynski 2021-07-20 09:15:26 +01:00
  • 0bdb69372f Update eslint-plugin-matrix-org Michael Telatynski 2021-07-20 09:15:26 +01:00
  • 53b0ef20f4 Update eslint-plugin-matrix-org Michael Telatynski 2021-07-20 09:15:25 +01:00
  • 6e0d8c4616 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-20 08:11:41 +00:00
  • 7033d160f1 Translated using Weblate (Galician) XoseM 2021-07-20 03:52:41 +00:00
  • 734b44ebdb Translated using Weblate (Chinese (Traditional)) Jeff Huang 2021-07-20 02:02:04 +00:00
  • 3f3ffbb616 Translated using Weblate (German) libexus 2021-07-19 19:55:32 +00:00
  • e11e17eb85 Merge pull request #6411 from SimonBrandner/fix/sticker-placeholder/18014 Michael Telatynski 2021-07-20 09:11:28 +01:00
  • fdd98bbf3f linter fix Germain Souquet 2021-07-20 09:36:33 +02:00
  • bb03fd90c8 Merge branch 'develop' into gsouqet/ts-migration-1 Germain Souquet 2021-07-20 09:02:48 +02:00
  • 5db20d9431 Fix placeholder centering Šimon Brandner 2021-07-20 08:54:32 +02:00
  • e9963cd22c Make emoji skins type more specific Robin Townsend 2021-07-19 21:57:03 -04:00
  • 5614ef1675 Rename some variables since their purpose has changed Robin Townsend 2021-07-19 21:52:32 -04:00
  • 0ac9454e3a Add lint:js-fix script Michael Telatynski 2021-07-19 22:49:17 +01:00
  • e136afe2eb Conform to new typescript eslint rules Michael Telatynski 2021-07-19 22:47:32 +01:00
  • ce78cdf4ad Conform to new react and typescript eslint rules Michael Telatynski 2021-07-19 22:43:11 +01:00
  • cdb4c88b8c Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 20:27:34 +00:00
  • 77edbc27f8 Merge pull request #18058 from vector-im/dbkr/upgrade_eslint_plugin_matrix_org David Baker 2021-07-19 21:27:29 +01:00
  • 63065761ed Merge pull request #236 from vector-im/dbkr/fix_docker_var_prefix David Baker 2021-07-19 20:36:11 +01:00
  • f8a922eaa1 Apply code review suggestions Robin Townsend 2021-07-19 15:09:15 -04:00
  • 71134c448d Fix docker variable passthrough David Baker 2021-07-19 20:09:13 +01:00
  • 290907a427 Merge pull request #235 from vector-im/dbkr/pass_through_indocker_env_vars David Baker 2021-07-19 18:43:24 +01:00
  • bfcb1e6bfb Pass through env vars with special prefix David Baker 2021-07-19 18:38:30 +01:00
  • 5ff5b9f45e Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 16:56:29 +00:00
  • b6feaf74bc Merge pull request #6407 from robintown/uppercase-avatar-placeholders Michael Telatynski 2021-07-19 17:56:25 +01:00
  • b36c748940 Fix avatar placeholders not getting capitalized Robin Townsend 2021-07-19 12:48:44 -04:00
  • 310c7807a1 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 16:24:11 +00:00
  • 4856559661 Merge pull request #6406 from matrix-org/travis/notifications-ui-order Travis Ralston 2021-07-19 10:24:06 -06:00
  • 6862d97961 APPEASE THY JSON Travis Ralston 2021-07-19 10:18:15 -06:00
  • b31043b5eb Revert order of notification setting radios Travis Ralston 2021-07-19 10:15:42 -06:00
  • 1b74286cf0 /me has managed to steel something by accident Šimon Brandner 2021-07-19 18:11:23 +02:00
  • 3250b35151 i18n Šimon Brandner 2021-07-19 18:10:31 +02:00
  • 097cc858ce Remove hover effect from files in the files panel Travis Ralston 2021-07-19 10:07:16 -06:00
  • 5d5b9f6022 Better labeling of images and stickers Šimon Brandner 2021-07-19 18:04:33 +02:00
  • 28f5827884 Add FileUtils Šimon Brandner 2021-07-19 18:02:33 +02:00
  • f2a88599a4 delint Michael Telatynski 2021-07-19 16:51:43 +01:00
  • de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 Michael Telatynski 2021-07-19 16:47:31 +01:00
  • 494200d576 v1.7.33 RiotRobot 2021-07-19 16:40:58 +01:00
  • 28cbc01d61 Prepare changelog for v1.7.33 RiotRobot 2021-07-19 16:40:58 +01:00
  • 87fedc27b1 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 15:27:09 +00:00
  • 9d56b56116 Reset matrix-react-sdk back to develop branch RiotRobot 2021-07-19 16:27:02 +01:00
  • bdb03c4490 Reset matrix-js-sdk back to develop branch RiotRobot 2021-07-19 16:26:51 +01:00
  • b70eb4aba7 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 15:26:45 +00:00
  • cfa47eec00 Merge branch 'master' into develop RiotRobot 2021-07-19 16:26:38 +01:00
  • d75b0b4ee8 v1.7.33 v1.7.33 RiotRobot 2021-07-19 16:22:37 +01:00
  • 85e1225a2c Prepare changelog for v1.7.33 RiotRobot 2021-07-19 16:22:36 +01:00
  • bc07d91810 Upgrade matrix-react-sdk to 3.26.0 RiotRobot 2021-07-19 16:19:36 +01:00
  • 183cf150e8 Upgrade matrix-js-sdk to 12.1.0 RiotRobot 2021-07-19 16:19:11 +01:00
  • 5ba54ea3da Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 15:16:43 +00:00
  • 676d2aa187 Resetting package fields for development RiotRobot 2021-07-19 16:16:18 +01:00
  • 13731177a3 Merge branch 'master' into develop RiotRobot 2021-07-19 16:14:58 +01:00
  • e7ad33db0f v3.26.0 RiotRobot 2021-07-19 16:00:26 +01:00
  • 4d11d5d5ea Prepare changelog for v3.26.0 RiotRobot 2021-07-19 16:00:25 +01:00
  • 3f75e9f224 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 14:58:45 +00:00
  • a3e5d76064 Merge pull request #6397 from matrix-org/t3chguy/fix/18040 Michael Telatynski 2021-07-19 15:58:40 +01:00
  • 3335ffa069 Upgrade matrix-js-sdk to 12.1.0 RiotRobot 2021-07-19 15:54:25 +01:00
  • 5acc7fe8d4 Make errorText properly optional instead of null Dariusz Niemczyk 2021-07-19 16:49:35 +02:00
  • 13efb396a9 Update eslint-plugin-matrix-org David Baker 2021-07-19 15:34:47 +01:00
  • 0c6d3563e1 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 14:34:24 +00:00
  • 96ddfefc03 Merge pull request #6403 from matrix-org/dbkr/upgrade_eslint_plugin_matrix_org David Baker 2021-07-19 15:34:21 +01:00
  • 9e9992078b Update src/@types/global.d.ts Dariusz Niemczyk 2021-07-19 16:34:07 +02:00
  • 97d490c1b6 Update src/components/views/auth/CaptchaForm.tsx Dariusz Niemczyk 2021-07-19 16:28:30 +02:00
  • c2394b9161 Fix styling comments Dariusz Niemczyk 2021-07-19 16:27:39 +02:00
  • 99edfc24e5 Update eslint-plugin-matrix-org David Baker 2021-07-19 15:26:40 +01:00
  • ea1e8bfdd4 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 14:17:17 +00:00
  • 4d72e05dc6 Translated using Weblate (Galician) XoseM 2021-07-19 12:21:08 +00:00
  • 1ea70e5b6e Merge pull request #6402 from matrix-org/copy-room-link James Salter 2021-07-19 15:14:19 +01:00
  • f9fbf6f210 Rename Copy Link to Copy Room Link James Salter 2021-07-19 15:05:04 +01:00
  • 9de5ebd4de Fix grecaptcha throwing useless error sometimes Dariusz Niemczyk 2021-07-19 15:41:44 +02:00
  • b0cc7afe85 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 11:53:47 +00:00
  • ddaa35cb8b Translated using Weblate (Dutch) jelv 2021-07-19 09:51:26 +00:00
  • c9a26665ef Translated using Weblate (French) Thibault Martin 2021-07-19 09:26:50 +00:00
  • 7619e35638 Merge branch 'origin/develop' into Weblate. Weblate 2021-07-19 11:53:42 +00:00