Commit Graph

  • 79efd61b66 $roomsublist-divider-color -> $primary-content Šimon Brandner 2021-10-16 18:30:04 +02:00
  • 36531be8ca $roomtile-preview-color -> $secondary-content Šimon Brandner 2021-10-16 18:27:43 +02:00
  • 1691127ad2 $field-focused-label-bg-color -> $background Šimon Brandner 2021-10-16 18:26:05 +02:00
  • a9c9e5b778 appease the linter CicadaCinema 2021-10-16 14:58:10 +01:00
  • 7b893366f2 Add spacing to Room settings - Notifications subsection CicadaCinema 2021-10-16 14:52:29 +01:00
  • 2fb802eb9e Move error message closer to password field Rafael Goncalves 2021-10-15 16:01:35 -03:00
  • 5a7c0d87b6 Rename ReplyThread to ReplyChain to avoid confusion with m.thread Germain Souquet 2021-10-15 17:42:44 +01:00
  • 0941b38b5d Name CryptographyPanel CSS classes consistent with style Andy Balaam 2021-10-15 16:09:36 +01:00
  • 6e3294b8af Merge branch 'origin/develop' into Weblate. Weblate 2021-10-15 15:07:12 +00:00
  • 4fb0d021ae Merge pull request #6897 from SimonBrandner/task/colors-4 David Baker 2021-10-15 16:07:07 +01:00
  • a547ee4654 Break 'Cryptography' settings into a separate component Andy Balaam 2021-10-15 15:06:55 +01:00
  • adb2fa251a Merge branch 'origin/develop' into Weblate. Weblate 2021-10-15 14:45:10 +00:00
  • 495f824f0f Merge pull request #6957 from matrix-org/gsouquet/fix-appearance-settings Germain 2021-10-15 15:45:05 +01:00
  • ac23afe9f1 Allow EventTile to be rendered with mock events Germain Souquet 2021-10-15 15:36:06 +01:00
  • d339398a7c Merge branch 'origin/develop' into Weblate. Weblate 2021-10-15 14:35:21 +00:00
  • 1b7277b8f0 Merge pull request #6943 from matrix-org/fayed/emoji-compare-buttons Faye Duxovni 2021-10-15 10:34:25 -04:00
  • 0a6e78fd38 Merge remote-tracking branch 'upstream/develop' into task/colors-4 Šimon Brandner 2021-10-15 16:23:40 +02:00
  • 697319357b Merge branch 'origin/develop' into Weblate. Weblate 2021-10-15 14:00:25 +00:00
  • 9a9d152ada Translated using Weblate (Chinese (Simplified)) sr093906 2021-10-15 13:58:17 +00:00
  • cee0d6894f Merge pull request #6951 from matrix-org/gsouquet/fix-thread-root-hidden Germain 2021-10-15 15:00:17 +01:00
  • 93fc24c875 Adding renderThreadInfo comment to explain data accessor Germain Souquet 2021-10-15 14:47:02 +01:00
  • 904147b194 Merge branch 'develop' into gsouquet/fix-thread-root-hidden Germain Souquet 2021-10-15 14:45:11 +01:00
  • ade53a5bd7 Do more re-ordering to keep things working Šimon Brandner 2021-10-15 15:35:06 +02:00
  • 3ec05c9cbd Merge pull request #6952 from matrix-org/gsouquet/display-new-thread Germain 2021-10-15 14:41:58 +01:00
  • 9ec1df0dfa Merge branch 'origin/develop' into Weblate. Weblate 2021-10-15 13:29:24 +00:00
  • f8c516d927 Add new thread message preview (#18958) (#6953) Dariusz Niemczyk 2021-10-15 15:29:17 +02:00
  • bc93954577 Remove repeated comment Šimon Brandner 2021-10-15 15:24:19 +02:00
  • 71eeb836d9 Merge remote-tracking branch 'upstream/develop' into task/colors-4 Šimon Brandner 2021-10-15 15:23:32 +02:00
  • f8b8b46852 Merge branch 'origin/develop' into Weblate. Weblate 2021-10-15 13:17:06 +00:00
  • 5a2c3fc702 Translated using Weblate (Estonian) Priit Jõerüüt 2021-10-15 12:56:59 +00:00
  • ad16b10a68 Translated using Weblate (Czech) waclaw66 2021-10-15 11:53:20 +00:00
  • 193720ff00 Translated using Weblate (Chinese (Simplified)) sr093906 2021-10-15 12:40:00 +00:00
  • f761723671 Translated using Weblate (French) Glandos 2021-10-15 11:30:02 +00:00
  • 9c753765d5 Merge pull request #6955 from andybalaam/table-for-devicespanel Andy Balaam 2021-10-15 14:16:45 +01:00
  • 690893ea6b Merge duplicate CSS selectors Andy Balaam 2021-10-15 13:32:39 +01:00
  • b7ab078cba Merge branch 'origin/develop' into Weblate. Weblate 2021-10-15 10:57:45 +00:00
  • f0ff3a26cc Merge pull request #6954 from aaronraimist/download-tooltip Germain 2021-10-15 11:57:39 +01:00
  • 7edec291ac Switch DevicesPanel to use table (for screen readers) Andy Balaam 2021-10-15 11:49:27 +01:00
  • 8cdb1c667d Fix tooltip when downloading unencrypted file Aaron Raimist 2021-10-15 05:23:59 -05:00
  • 6baa6c8f65 Listen to new thread to render info on timeline Germain Souquet 2021-10-15 11:08:33 +01:00
  • 52dfd8a417 Merge branch 'origin/develop' into Weblate. Weblate 2021-10-15 09:27:45 +00:00
  • af55ac7b8c Merge pull request #6950 from matrix-org/gsouquet/threads-replies-compat Germain 2021-10-15 10:27:40 +01:00
  • 17c4cc91af Reconcile threads root with its children before displaying it Germain Souquet 2021-10-15 10:26:04 +01:00
  • 3dcf0d0b7e Fix incorrect logic to hide thread relations Germain Souquet 2021-10-15 10:25:42 +01:00
  • 3b3a80f0af Merge branch 'origin/develop' into Weblate. Weblate 2021-10-15 07:59:22 +00:00
  • 0f94d6d81c Translated using Weblate (Chinese (Traditional)) Jeff Huang 2021-10-15 01:54:38 +00:00
  • 6b61cd1267 Translated using Weblate (Czech) waclaw66 2021-10-14 17:31:59 +00:00
  • 318f75fef3 Translated using Weblate (Estonian) Priit Jõerüüt 2021-10-14 18:43:53 +00:00
  • 2ad11b3af7 Merge pull request #6949 from matrix-org/gsouquet/threads-relations Germain 2021-10-15 08:58:57 +01:00
  • 99ad603d91 Merge branch 'develop' into gsouquet/threads-relations Germain Souquet 2021-10-15 08:43:51 +01:00
  • 5fccbd4ef7 Remove auto-import Germain Souquet 2021-10-14 17:40:00 +01:00
  • 378536ee2a Add 'm.thread' relation for replies to a threaded event Germain Souquet 2021-10-14 17:22:06 +01:00
  • d315641056 Make threads use 'm.thread' relation Germain Souquet 2021-10-14 16:57:02 +01:00
  • da1886f0ac Merge branch 'origin/develop' into Weblate. Weblate 2021-10-14 15:38:06 +00:00
  • a7365f75b8 Translated using Weblate (Chinese (Simplified)) sr093906 2021-10-14 15:01:55 +00:00
  • 2dd6dddc67 Fix incorrect liveTimeline reference (#6948) Dariusz Niemczyk 2021-10-14 17:37:56 +02:00
  • 26557930fa Merge branch 'origin/develop' into Weblate. Weblate 2021-10-14 14:43:02 +00:00
  • f8b45aca0f Translated using Weblate (Chinese (Simplified)) sr093906 2021-10-14 14:31:30 +00:00
  • c31bd8c647 Remove unnecessary adapter in ThreadPanel-test.tsx (#6946) Dariusz Niemczyk 2021-10-14 16:42:54 +02:00
  • f40559edd8 Merge branch 'origin/develop' into Weblate. Weblate 2021-10-14 13:27:45 +00:00
  • 748fe59eaa Translated using Weblate (Russian) Leonidas Shear 2021-10-14 13:08:44 +00:00
  • 562a880c7d Create room threads list view (#6904) Dariusz Niemczyk 2021-10-14 15:27:35 +02:00
  • 3dd419f465 Merge branch 'origin/develop' into Weblate. Weblate 2021-10-14 12:40:36 +00:00
  • f37d6b135a Translated using Weblate (Italian) random 2021-10-14 10:41:16 +00:00
  • 6bb47ec710 Merge pull request #6945 from matrix-org/t3chguy/fix/19390 Michael Telatynski 2021-10-14 13:40:27 +01:00
  • 069a8d05f1 Space Room View should react to join rule changes down /sync Michael Telatynski 2021-10-14 12:06:24 +01:00
  • 9304934e7c Merge branch 'origin/develop' into Weblate. Weblate 2021-10-14 10:11:47 +00:00
  • 3f8076b9f7 Translated using Weblate (Estonian) Priit Jõerüüt 2021-10-14 09:49:49 +00:00
  • ae29ac4b38 Translated using Weblate (Albanian) Besnik Bleta 2021-10-14 09:45:09 +00:00
  • 63abf9e2c1 Translated using Weblate (Chinese (Simplified)) sr093906 2021-10-14 09:28:47 +00:00
  • 124e75b2f0 Translated using Weblate (Hungarian) Szimszon 2021-10-14 09:40:14 +00:00
  • 4d8346f364 Merge pull request #6884 from matrix-org/t3chguy/fix/19010 Michael Telatynski 2021-10-14 11:11:29 +01:00
  • 020eca6922 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19010 Michael Telatynski 2021-10-14 11:05:29 +01:00
  • 84124112d7 Merge branch 'origin/develop' into Weblate. Weblate 2021-10-14 08:59:39 +00:00
  • 4118d13846 Merge pull request #6829 from matrix-org/t3chguy/fix/18969 Michael Telatynski 2021-10-14 09:59:34 +01:00
  • 3780ebcb7c Merge branch 'origin/develop' into Weblate. Weblate 2021-10-14 08:58:49 +00:00
  • a37c10b256 Merge pull request #6920 from matrix-org/t3chguy/fix/17410 Michael Telatynski 2021-10-14 09:58:45 +01:00
  • ec7b844284 Merge branch 'origin/develop' into Weblate. Weblate 2021-10-14 08:58:33 +00:00
  • 53d7c9d2e5 Merge pull request #6921 from matrix-org/t3chguy/fix/19003.1 Michael Telatynski 2021-10-14 09:58:28 +01:00
  • 889fcdb0c2 Merge branch 'origin/develop' into Weblate. Weblate 2021-10-14 08:58:24 +00:00
  • 2a3c483f96 Merge pull request #6919 from matrix-org/t3chguy/fix/19146 Michael Telatynski 2021-10-14 09:58:19 +01:00
  • 28ceb62f0d Merge branch 'origin/develop' into Weblate. Weblate 2021-10-14 08:31:04 +00:00
  • f64daf2522 Translated using Weblate (Russian) Nikita Epifanov 2021-10-13 20:40:23 +00:00
  • c6be65d86d Translated using Weblate (Albanian) Besnik Bleta 2021-10-14 06:54:39 +00:00
  • cc8d2e3776 Translated using Weblate (Estonian) Priit Jõerüüt 2021-10-13 22:16:06 +00:00
  • ffa823e0d4 Translated using Weblate (Hungarian) Szimszon 2021-10-13 18:32:00 +00:00
  • d5c93d772a Translated using Weblate (Chinese (Traditional)) Jeff Huang 2021-10-14 02:41:01 +00:00
  • 417ba9c2ff Translated using Weblate (Chinese (Simplified)) sr093906 2021-10-14 00:44:38 +00:00
  • 1f7d07ab6c Merge pull request #6942 from SimonBrandner/fix/autoplay-setting James Salter 2021-10-14 09:30:43 +01:00
  • eb68e22019 Rerun yarn i18n to put the strings in a different order Faye Duxovni 2021-10-14 01:03:53 -04:00
  • 8f10a1d3fb Update the button styling on the emoji comparison dialog during cross-signing Faye Duxovni 2021-10-14 00:46:15 -04:00
  • 4bc4eb74e2 Translated using Weblate (Finnish) Jiri Grönroos 2021-10-12 19:15:26 +00:00
  • 9533f7b0b9 Don't setValue() if that would lead to setting a null/undefined Šimon Brandner 2021-10-13 19:47:49 +02:00
  • c8360235be Merge branch 'origin/develop' into Weblate. Weblate 2021-10-13 17:28:58 +00:00
  • ea7257698c Merge pull request #6934 from matrix-org/travis/labs/polls Travis Ralston 2021-10-13 11:28:53 -06:00
  • 794043f1b8 Merge branch 'origin/develop' into Weblate. Weblate 2021-10-13 17:28:50 +00:00
  • 4c25a5e8bd Translated using Weblate (Finnish) Jiri Grönroos 2021-10-13 06:08:38 +00:00
  • ef470a1207 Merge pull request #19368 from vector-im/travis/labs/polls Travis Ralston 2021-10-13 11:28:46 -06:00
  • 3b9019ab3b Merge branch 'origin/develop' into Weblate. Weblate 2021-10-13 17:25:57 +00:00
  • 3643359c15 Merge pull request #6922 from matrix-org/travis/hide-buttons-customisation Travis Ralston 2021-10-13 11:25:52 -06:00