Commit Graph

  • 7db95b614a Revert to arrow functions to bind this Jorik Schellekens 2020-06-01 18:01:12 +01:00
  • 70423178de Merge branch 'origin/develop' into Weblate. Weblate 2020-06-01 16:58:08 +00:00
  • 8fea9e831e Merge pull request #4665 from JorikSchellekens/joriks/appearance-tab Jorik Schellekens 2020-06-01 17:58:03 +01:00
  • bcf732b763 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-01 16:57:47 +00:00
  • c1adee376f Merge pull request #4676 from JorikSchellekens/joriks/fix-irc-resizer Jorik Schellekens 2020-06-01 17:57:43 +01:00
  • df18638164 useIRCLayout moved to props Jorik Schellekens 2020-06-01 17:34:42 +01:00
  • 24234c9d9c Merge branch 'origin/develop' into Weblate. Weblate 2020-06-01 16:25:49 +00:00
  • 7d0ccabe6c Translated using Weblate (Norwegian Nynorsk) Nils J. Haugen 2020-06-01 13:32:50 +00:00
  • a57ef5c170 Translated using Weblate (Italian) random 2020-06-01 07:56:54 +00:00
  • d19c5b8400 Translated using Weblate (Hungarian) notramo 2020-05-31 20:17:52 +00:00
  • 858b52cd85 Translated using Weblate (Finnish) Tuomas Hietala 2020-06-01 13:00:04 +00:00
  • 6ed3349140 Merge pull request #4674 from matrix-org/t3chguy/upload-tweaks Michael Telatynski 2020-06-01 17:25:39 +01:00
  • e56311fc06 Merge pull request #96 from vector-im/t3chguy/fix-save-as Michael Telatynski 2020-06-01 17:09:03 +01:00
  • 19e8fa01f2 use import instead of getComponent Michael Telatynski 2020-06-01 17:05:53 +01:00
  • 85978426c9 Fix selectors Jorik Schellekens 2020-06-01 16:45:19 +01:00
  • 03c6813425 Update res/css/views/rooms/_GroupLayout.scss Jorik Schellekens 2020-06-01 16:00:11 +01:00
  • 53129cafc7 Move comment Jorik Schellekens 2020-06-01 15:36:55 +01:00
  • fb9b14ec51 Remove superflous list Jorik Schellekens 2020-06-01 15:35:25 +01:00
  • b48818bb46 Increase specificity of compact layout selectors Jorik Schellekens 2020-06-01 15:23:34 +01:00
  • 7b2f2daf2c Upload and Paste to Upload tweaks Michael Telatynski 2020-06-01 15:00:55 +01:00
  • 69747b6114 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab Jorik Schellekens 2020-06-01 14:32:31 +01:00
  • 9e9bcb4974 Move id generator into constrcutor Jorik Schellekens 2020-06-01 12:04:47 +01:00
  • 2e907b6e36 Merge pull request #97 from drlellinger/patch-1 Travis Ralston 2020-05-31 18:28:19 -06:00
  • 044010adb7 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-31 20:17:29 +00:00
  • 610c35e8cc Translated using Weblate (Hungarian) notramo 2020-05-31 19:15:43 +00:00
  • 179da0132b Translated using Weblate (Hungarian) Szimszon 2020-05-30 18:33:06 +00:00
  • 609e35b5ea Translated using Weblate (Galician) XoseM 2020-05-30 13:21:57 +00:00
  • fc638ffc3e Translated using Weblate (French) Kévin C 2020-05-31 07:39:40 +00:00
  • 7c290b4b5d Translated using Weblate (Esperanto) Tirifto 2020-05-30 12:16:55 +00:00
  • 5da9c414e3 Translated using Weblate (Czech) Stanislav Lukeš 2020-05-30 20:29:11 +00:00
  • cf465a4595 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-05-31 02:35:45 +00:00
  • dff352081b Translated using Weblate (Albanian) Besnik Bleta 2020-05-30 15:51:46 +00:00
  • 419857c29c Merge pull request #4647 from JorikSchellekens/joriks/fix-filepanel-regression Jorik Schellekens 2020-05-31 21:17:14 +01:00
  • c82c80a2e0 Fixed error in User-specified config.json drlellinger 2020-05-31 18:25:26 +02:00
  • aab8f6755f bump yarn lock Matthew Hodgson 2020-05-31 16:06:33 +01:00
  • 9cdc1788b2 rebuild with emojibase-data 5 Matthew Hodgson 2020-05-31 16:04:15 +01:00
  • 566d368c70 fix sbix as per https://github.com/matrix-org/twemoji-colr/commit/407a1f4b6d29fd64191f825d999b36f87f757e0c Matthew Hodgson 2020-05-31 15:41:28 +01:00
  • c3ad15e479 upgrade to twemoji 13.0.0 Matthew Hodgson 2020-05-31 14:09:44 +01:00
  • 20fb0f477b tidy comment Michael Telatynski 2020-05-31 12:28:15 +01:00
  • c6620735b4 Fix electron context menu copy/save-as Michael Telatynski 2020-05-31 12:23:23 +01:00
  • 66a945b26c Merge branches 'develop' and 't3chguy/autocomplete-scrollintoview' of github.com:matrix-org/matrix-react-sdk into t3chguy/autocomplete-scrollintoview Michael Telatynski 2020-05-30 13:41:00 +01:00
  • bc83984a62 tidy up the ref to ref with a forwardRef and initialComponent signature Michael Telatynski 2020-05-30 13:30:59 +01:00
  • 5c6efa4316 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-30 12:02:08 +00:00
  • afd0d69ab5 Merge pull request #13864 from vector-im/t3chguy/toasts6_1 Michael Telatynski 2020-05-30 13:02:03 +01:00
  • ed93b13741 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-30 11:54:47 +00:00
  • 6472ca451e Merge pull request #4669 from matrix-org/t3chguy/toasts6_1 Michael Telatynski 2020-05-30 12:54:42 +01:00
  • 8a971e59b9 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-30 11:54:32 +00:00
  • e368007274 Merge pull request #13862 from vector-im/t3chguy/toasts6 Michael Telatynski 2020-05-30 12:54:27 +01:00
  • c6688f0245 make button margin equal all around Michael Telatynski 2020-05-30 12:52:21 +01:00
  • f7bbc0c337 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-30 11:46:59 +00:00
  • 111a656ab6 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-05-30 03:27:22 +00:00
  • 097f27c822 Merge pull request #4668 from matrix-org/t3chguy/toasts6 Michael Telatynski 2020-05-30 12:46:53 +01:00
  • f8f1a99a2d Merge branch 't3chguy/toasts6' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts6 Michael Telatynski 2020-05-30 12:36:34 +01:00
  • 5b31fdd308 remove stale references to MatrixToolbar Michael Telatynski 2020-05-30 12:36:17 +01:00
  • 47b6b93371 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-29 23:44:04 +00:00
  • 7750c95a02 typoe Matthew Hodgson 2020-05-30 00:43:55 +01:00
  • 8476490213 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-29 23:42:31 +00:00
  • f3fedc5fc4 fix url Matthew Hodgson 2020-05-30 00:42:23 +01:00
  • 8087b521e6 Autocomplete: use scrollIntoView for auto-scroll instead of broken manual scrollTop calculation Michael Telatynski 2020-05-29 21:42:33 +01:00
  • 0bbf971bac Update src/dispatcher/actions.ts Michael Telatynski 2020-05-29 20:50:47 +01:00
  • 4346207811 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-29 19:47:36 +00:00
  • 3f76b73b50 Merge pull request #4659 from matrix-org/t3chguy/dialog_cancel_space Michael Telatynski 2020-05-29 20:47:31 +01:00
  • d60f1553b1 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-29 19:40:47 +00:00
  • cb48eb4933 Merge pull request #13834 from vector-im/t3chguy/docs Michael Telatynski 2020-05-29 20:40:43 +01:00
  • a944262bb5 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-29 19:16:23 +00:00
  • 0e6b2b1b87 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-29 19:16:19 +00:00
  • f0f8051ef3 Translated using Weblate (Lithuanian) MamasLT 2020-05-29 18:01:10 +00:00
  • 06cc1c45bf Merge pull request #13777 from vector-im/t3chguy/modular-utm Michael Telatynski 2020-05-29 20:16:18 +01:00
  • 27b7db2b30 Merge pull request #92 from vector-im/t3chguy/modular-utm Michael Telatynski 2020-05-29 20:16:16 +01:00
  • 0b44e30517 Merge pull request #4627 from matrix-org/t3chguy/modular-utm Michael Telatynski 2020-05-29 20:16:13 +01:00
  • 66272fc226 Allow deferring of Update Toast until the next morning Michael Telatynski 2020-05-29 19:59:48 +01:00
  • 9431393bda Allow deferring of Update Toast until the next morning Michael Telatynski 2020-05-29 19:59:47 +01:00
  • b61f1704d3 Merge branch 'develop' into joriks/fix-filepanel-regression Jorik Schellekens 2020-05-29 19:14:19 +01:00
  • f45c584c8a Correct the GenericToast props to show the two modes of operation Michael Telatynski 2020-05-29 19:13:59 +01:00
  • 1fd74f22c8 Give contextual feedback for manual update check instead of banner Michael Telatynski 2020-05-29 18:24:45 +01:00
  • efd0da44a1 Give contextual feedback for manual update check instead of banner Michael Telatynski 2020-05-29 18:24:45 +01:00
  • 3a4f0a43d5 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-29 16:47:09 +00:00
  • 822a126cb6 Merge pull request #4663 from JorikSchellekens/develop Travis Ralston 2020-05-29 10:47:04 -06:00
  • 631184c661 Fix upgrading with already trusted backup David Baker 2020-05-29 15:55:16 +01:00
  • f54bac0e95 Use recovery keys over passphrases David Baker 2020-05-29 15:42:07 +01:00
  • 8b3d2f12c5 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-29 14:34:07 +00:00
  • 4a29dc34fe Translated using Weblate (Slovak) yuuki-san 2020-05-29 11:11:20 +00:00
  • 658608e86c Translated using Weblate (Japanese) call_xz 2020-05-29 10:51:02 +00:00
  • 92a2743ac4 Translated using Weblate (Italian) random 2020-05-29 08:58:38 +00:00
  • 6bc1811809 Translated using Weblate (Galician) XoseM 2020-05-29 04:19:44 +00:00
  • 28017f5b04 Translated using Weblate (French) Kévin C 2020-05-29 06:58:22 +00:00
  • e24773af83 Merge pull request #4667 from matrix-org/travis/uia/auth Travis Ralston 2020-05-29 08:33:49 -06:00
  • ea064afca4 Fix/document a number of UIA oddities Travis Ralston 2020-05-29 08:23:59 -06:00
  • f40cfe4a3b Implement new design with new iconography Michael Telatynski 2020-05-29 15:00:27 +01:00
  • ccd0c952e3 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer Michael Telatynski 2020-05-29 14:53:42 +01:00
  • d02a18bfff Apply FocusLock to ImageView to capture Escape handling Michael Telatynski 2020-05-29 01:44:09 +01:00
  • 66c0d53f3e Create and use stylised checkboxes Jorik Schellekens 2020-05-28 22:33:00 +01:00
  • 472c421150 Bubble up a decline-to-render of verification events to outside wrapper Zoe 2020-05-28 21:41:31 +01:00
  • 6559fd499e Fix field placeholder regression Jorik Schellekens 2020-05-28 21:09:42 +01:00
  • 188190888b more lint Hubert Chathi 2020-05-28 15:36:06 -04:00
  • b366dbb460 fix lint errors and add copyright info Hubert Chathi 2020-05-28 15:30:00 -04:00
  • 19edcd436e use keytar to store pickle keys Hubert Chathi 2020-05-28 15:07:39 -04:00
  • 0c14a6a175 Merge branch 'origin/develop' into Weblate. Weblate 2020-05-28 18:57:52 +00:00
  • 930b8ff901 Merge pull request #4662 from JorikSchellekens/joriks/appearance-tab Jorik Schellekens 2020-05-28 19:57:46 +01:00
  • fb62f6dfb4 make IPC calls to get pickle key Hubert Chathi 2020-05-28 14:25:54 -04:00