Commit Graph

  • 81b889783a Merge branch 'origin/develop' into Weblate. Weblate 2020-06-25 13:18:32 +00:00
  • d5cf4bcfa2 Translated using Weblate (Galician) XoseM 2020-06-25 13:18:18 +00:00
  • 4d47dcaabd Merge pull request #4825 from matrix-org/travis/room-list/default-lists Travis Ralston 2020-06-25 07:18:26 -06:00
  • c7fc4cacda Merge branch 'origin/develop' into Weblate. Weblate 2020-06-25 13:18:03 +00:00
  • 5045c0b135 Translated using Weblate (Galician) XoseM 2020-06-25 13:12:19 +00:00
  • 92f0f1a5d8 Merge pull request #4832 from matrix-org/travis/react-can-shush Travis Ralston 2020-06-25 07:17:56 -06:00
  • a3b38a2b5f Make LoggedInView a real component because it uses shouldComponentUpdate Travis Ralston 2020-06-25 07:14:02 -06:00
  • 149d518394 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-25 13:11:39 +00:00
  • 2ef2f76de9 Translated using Weblate (Kabyle) ziriSut 2020-06-25 09:04:25 +00:00
  • fa3cc28dcc Translated using Weblate (German) Michael Albert 2020-06-25 06:46:04 +00:00
  • aaff3e0bec Translated using Weblate (Galician) XoseM 2020-06-25 13:01:31 +00:00
  • 98fc23acb3 Merge pull request #4829 from matrix-org/t3chguy/notifications0 Michael Telatynski 2020-06-25 14:11:24 +01:00
  • c8c99d7ded Merge pull request #14199 from vector-im/jryans/fix-load-spelling J. Ryan Stinnett 2020-06-25 13:53:54 +01:00
  • 65febd24eb lint David Baker 2020-06-25 13:52:38 +01:00
  • 0acb35dc23 Update end to end tests David Baker 2020-06-25 13:48:11 +01:00
  • 29cdebb611 i18n David Baker 2020-06-25 13:26:32 +01:00
  • 2b144a846a Apply some of the newer styling to passphrase / recovery key entry David Baker 2020-06-25 12:44:15 +01:00
  • 92eb687a75 Fix spelling on startup error page J. Ryan Stinnett 2020-06-25 12:16:32 +01:00
  • 8743af56ad Bring notification utils into this century to simplify ongoing Notifications work Michael Telatynski 2020-06-25 09:00:13 +01:00
  • d4eebd5202 Fix alwaysShowBadgeCounts settings defn Michael Telatynski 2020-06-25 08:58:54 +01:00
  • edd09f66d1 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 Michael Telatynski 2020-06-25 08:45:32 +01:00
  • dbe575d523 Remove DEBUG Michael Telatynski 2020-06-25 08:44:24 +01:00
  • dc099efb19 make Notifier getSoundForRoom synchronous Michael Telatynski 2020-06-25 08:43:35 +01:00
  • 2fe3780b2a Merge branch 'origin/develop' into Weblate. Weblate 2020-06-25 02:26:37 +00:00
  • 223c26b033 Merge pull request #4826 from matrix-org/travis/room-list/cleanup Travis Ralston 2020-06-24 20:26:32 -06:00
  • 90ff4585d5 Remove extraneous debug from the new left panel Travis Ralston 2020-06-24 20:14:01 -06:00
  • 37a415693f Allow the user to resize the new sublists to 1 tile Travis Ralston 2020-06-24 20:08:26 -06:00
  • 752b2acc56 Move MessagePreviewStore into the room list namespace Travis Ralston 2020-06-24 12:23:09 -06:00
  • fc9e4484d9 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-25 01:48:59 +00:00
  • 7dc2fc0751 Merge pull request #4824 from matrix-org/travis/room-list/fix-icons Travis Ralston 2020-06-24 19:48:53 -06:00
  • 291914492f Fix icons in the new user menu not showing up Travis Ralston 2020-06-24 19:20:43 -06:00
  • f20b87a038 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-24 16:55:20 +00:00
  • bb9999a414 Merge pull request #4817 from matrix-org/travis/room-list/sticky-room-fixes Travis Ralston 2020-06-24 10:55:14 -06:00
  • c047a76f1d Update the filtering for the right tag Travis Ralston 2020-06-24 10:36:43 -06:00
  • 9b4b6ba785 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-24 16:35:30 +00:00
  • 767090dd78 Merge pull request #4821 from matrix-org/jryans/more-reset-paths J. Ryan Stinnett 2020-06-24 17:35:24 +01:00
  • ce1bcda4ac Merge branch 'origin/develop' into Weblate. Weblate 2020-06-24 16:34:52 +00:00
  • b4ab15f91f Translated using Weblate (Italian) random 2020-06-24 13:32:40 +00:00
  • 1aef7cdfea Translated using Weblate (Galician) XoseM 2020-06-24 14:42:49 +00:00
  • 906b72082e Merge pull request #4819 from matrix-org/travis/room-list/icon-masks Travis Ralston 2020-06-24 10:34:29 -06:00
  • ee5582ab32 Remove the "You're done" screen David Baker 2020-06-24 16:55:35 +01:00
  • 966837232c Add header icons & justification David Baker 2020-06-24 16:12:46 +01:00
  • 0638b94cc2 Move compact checkbox Jorik Schellekens 2020-06-24 16:06:50 +01:00
  • a11feaca32 Merge branch 'poljar/skip-unneeded-reindex' into develop Damir Jelić 2020-06-24 16:59:29 +02:00
  • b23cc417e1 package.json: Bump the required Seshat version. Damir Jelić 2020-06-24 16:31:49 +02:00
  • a23b784e00 Enable continue button if a passphrase has been set David Baker 2020-06-24 15:21:09 +01:00
  • b01015f5c5 Show cross-signing / secret storage reset button in more cases J. Ryan Stinnett 2020-06-24 14:30:12 +01:00
  • 76c93c8bf7 Merge pull request #14175 from vector-im/bwindels/custom-theme-font Bruno Windels 2020-06-24 13:23:21 +00:00
  • fe0ed2b4f3 Update docs/theming.md Bruno Windels 2020-06-24 13:15:59 +00:00
  • 7ee06ce975 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-24 13:15:47 +00:00
  • fc61145c11 Merge pull request #4814 from matrix-org/bwindels/custom-theme-font Bruno Windels 2020-06-24 13:15:42 +00:00
  • 08b86952a0 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-24 13:05:52 +00:00
  • 5e07052f9e Merge pull request #4816 from matrix-org/travis/room-list/tweak/sublisting Travis Ralston 2020-06-24 07:05:46 -06:00
  • 7518fca98b Merge branch 'origin/develop' into Weblate. Weblate 2020-06-24 13:04:57 +00:00
  • 3b24f42def Merge pull request #4818 from matrix-org/travis/room-list/user-menu-polish Travis Ralston 2020-06-24 07:04:49 -06:00
  • 256636ccf8 Use display:block over absolute positioning Travis Ralston 2020-06-24 07:04:19 -06:00
  • 183eb78fa8 fix lint Bruno Windels 2020-06-24 14:58:41 +02:00
  • 2ce448943b add documentation for fonts in custom theme Bruno Windels 2020-06-24 14:55:57 +02:00
  • b3fd1eda03 change the format of font faces to something closer to the css Bruno Windels 2020-06-24 14:54:14 +02:00
  • bf15e96a6a Make pasphrase screen look more like designs David Baker 2020-06-24 12:43:56 +01:00
  • e5325fa297 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-24 10:00:19 +00:00
  • bced934613 Translated using Weblate (Kabyle) ziriSut 2020-06-24 00:52:10 +00:00
  • 354e31e7db Translated using Weblate (Hungarian) Szimszon 2020-06-24 06:48:24 +00:00
  • f1fc81be69 Translated using Weblate (Galician) XoseM 2020-06-24 07:16:08 +00:00
  • 7cb48aac9b Translated using Weblate (French) Kévin C 2020-06-24 07:01:40 +00:00
  • bf34d37606 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2020-06-24 01:12:53 +00:00
  • dd8109f77a Translated using Weblate (Bulgarian) Slavi Pantaleev 2020-06-24 07:44:19 +00:00
  • c660467c33 Merge pull request #4802 from matrix-org/joriks/fix-reply-messageactionbar Jorik Schellekens 2020-06-24 11:00:08 +01:00
  • 2da6bc6a1e electron-main: Rename the deletion method for the index. Damir Jelić 2020-06-24 11:06:09 +02:00
  • 5c7e59b132 Use theme-capable icons in the user menu Travis Ralston 2020-06-23 21:17:39 -06:00
  • 380aed4244 Update profile information in User Menu Travis Ralston 2020-06-23 20:59:26 -06:00
  • f93d67fc65 Fix sticky room disappearing/jumping in search results Travis Ralston 2020-06-23 16:49:39 -06:00
  • 001abf40fb Merge branch 'origin/develop' into Weblate. Weblate 2020-06-23 19:38:12 +00:00
  • a915da650a Translated using Weblate (Galician) XoseM 2020-06-23 14:57:27 +00:00
  • cc60fff198 Translated using Weblate (Albanian) Besnik Bleta 2020-06-23 15:15:02 +00:00
  • 74e4ea7d48 Merge pull request #4797 from matrix-org/uhoreg/distrust_backup Hubert Chathi 2020-06-23 15:38:03 -04:00
  • dd9112a01a Decrease margin between new sublists Travis Ralston 2020-06-23 11:44:40 -06:00
  • 0a2934203f Remove tslint Jorik Schellekens 2020-06-23 17:01:40 +01:00
  • 7699aafcaf Use new eslint package- fix lint issues in ts and js Jorik Schellekens 2020-06-23 16:41:36 +01:00
  • 3b13a623cd cleanup Bruno Windels 2020-06-23 17:54:57 +02:00
  • 2f6fc6bba2 allow adding custom font faces in theme Bruno Windels 2020-06-23 17:54:38 +02:00
  • b3510aa2b4 remove css vars when switching theme Bruno Windels 2020-06-23 17:54:17 +02:00
  • e083856801 allow changing the font-family Bruno Windels 2020-06-23 17:53:16 +02:00
  • 86597aabca better naming Bruno Windels 2020-06-23 17:52:54 +02:00
  • 3716f9d82c Fix cancel button / prompt David Baker 2020-06-23 16:43:52 +01:00
  • 0694776b25 Update the 'save your security key' screen David Baker 2020-06-23 16:27:41 +01:00
  • 141107c678 electron-main: Skip the reindex if we're going to delete the db anyways. Damir Jelić 2020-06-23 16:42:27 +02:00
  • edc384ac92 Merge branch 'origin/develop' into Weblate. Weblate 2020-06-23 14:38:55 +00:00
  • 1e39279a77 Merge pull request #4761 from matrix-org/joriks/appearance-advanced Jorik Schellekens 2020-06-23 15:38:50 +01:00
  • 2000f420bd Reset matrix-react-sdk back to develop branch RiotRobot 2020-06-23 15:31:49 +01:00
  • 979ce51208 Reset matrix-js-sdk back to develop branch RiotRobot 2020-06-23 15:31:35 +01:00
  • 9be380fdaf Merge branch 'master' into develop RiotRobot 2020-06-23 15:30:51 +01:00
  • 42c6a26e9f v1.6.6 v1.6.6 RiotRobot 2020-06-23 15:26:55 +01:00
  • abc4f42f83 Prepare changelog for v1.6.6 RiotRobot 2020-06-23 15:26:55 +01:00
  • 858386b61a Merge branch 'origin/develop' into Weblate. Weblate 2020-06-23 14:26:12 +00:00
  • 6739c90f44 Fix SDK in changelog RiotRobot 2020-06-23 15:25:59 +01:00
  • da308da6ac Merge branch 'origin/develop' into Weblate. Weblate 2020-06-23 14:24:14 +00:00
  • 3829362754 Fix up merge to develop J. Ryan Stinnett 2020-06-23 15:24:02 +01:00
  • 503442e189 Reset matrix-js-sdk back to develop branch RiotRobot 2020-06-23 15:20:45 +01:00
  • b1c106e8b2 Upgrade matrix-react-sdk to 2.8.0 RiotRobot 2020-06-23 15:20:43 +01:00