Commit Graph

  • 0f98c9127d Fix checks to show prompt to start new chats David Baker 2021-09-15 15:08:23 +01:00
  • a571460871 Use a universal copy Šimon Brandner 2021-09-15 15:30:23 +02:00
  • 8094a34384 Merge remote-tracking branch 'upstream/develop' into fix/user-info-dm/17877 Šimon Brandner 2021-09-15 15:28:05 +02:00
  • 73f9e48c11 Fix comment James Salter 2021-09-15 14:16:11 +01:00
  • 93321d96f0 lint James Salter 2021-09-15 14:10:15 +01:00
  • 839fdbca62 fix tests James Salter 2021-09-15 13:55:34 +01:00
  • 8f1204c32e Update comment reflecting tracking scheme via analytics ID James Salter 2021-09-15 13:00:59 +01:00
  • 76c782c64c Remove all room data from tracking James Salter 2021-09-15 12:58:26 +01:00
  • 6155d114ef Merge branch 'origin/develop' into Weblate. Weblate 2021-09-15 11:51:15 +00:00
  • f6f4daec00 Translated using Weblate (Czech) waclaw66 2021-09-15 05:50:40 +00:00
  • 714af54be4 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2021-09-15 02:20:56 +00:00
  • b24ad3a447 Translated using Weblate (Dutch) jelv 2021-09-15 08:09:37 +00:00
  • dd7253e848 Translated using Weblate (Hungarian) Szimszon 2021-09-15 06:44:19 +00:00
  • 1aabe4b535 Merge pull request #6807 from matrix-org/pseudonymous-analytics-id James Salter 2021-09-15 12:50:59 +01:00
  • 8f3c0be388 Merge branch 'origin/develop' into Weblate. Weblate 2021-09-15 09:18:33 +00:00
  • 4f0c3bf4ff Merge pull request #18896 from kittykat/issue-automation Kat Gerasimova 2021-09-15 10:18:28 +01:00
  • 79f03dfec3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pseudonymous-analytics-id James Salter 2021-09-15 09:52:15 +01:00
  • 48fbbf2f44 Fix import, convert event type to constant James Salter 2021-09-15 09:48:48 +01:00
  • 46b7f2356e Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 20:50:34 +00:00
  • 574e848bf3 Merge branch 'master' into develop Travis Ralston 2021-09-14 14:50:07 -06:00
  • 391b34ebd7 Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 20:41:01 +00:00
  • 1f1693cb09 Merge pull request #6781 from SimonBrandner/feature/media-handling Travis Ralston 2021-09-14 14:40:57 -06:00
  • 21743d8ad2 Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 19:40:25 +00:00
  • 30972c597d Merge pull request #6777 from robintown/room-list-scroll-jumps Travis Ralston 2021-09-14 13:40:20 -06:00
  • 2e476db30c Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 19:36:39 +00:00
  • 34ce61862d Merge pull request #6782 from SimonBrandner/fix/screensharing-dialog Travis Ralston 2021-09-14 13:36:35 -06:00
  • 6b55ba8afb Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 19:33:42 +00:00
  • f56afe219c Translated using Weblate (Estonian) Priit Jõerüüt 2021-09-14 19:32:29 +00:00
  • 7b9dc09cd4 Merge pull request #6784 from SimonBrandner/fix/end-of-line-emoji Travis Ralston 2021-09-14 13:33:34 -06:00
  • 5ddbbfe7bd Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 19:26:08 +00:00
  • fdb004b4e8 Merge pull request #6785 from robintown/message-bubble-misc Travis Ralston 2021-09-14 13:26:03 -06:00
  • 8a430cfe5f Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 19:25:32 +00:00
  • c3ad978941 Merge pull request #6795 from robintown/message-bubble-font-size Travis Ralston 2021-09-14 13:25:28 -06:00
  • bffd3b4f13 Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 19:10:12 +00:00
  • 18d406421b Merge pull request #6806 from SimonBrandner/task/remove-message_send_failed Travis Ralston 2021-09-14 13:10:07 -06:00
  • fc1da27d49 Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 19:07:19 +00:00
  • 333418232d Merge pull request #6808 from SimonBrandner/task/context_menus-ts Travis Ralston 2021-09-14 13:07:15 -06:00
  • 75b1d813f1 Encourage false positives of the error dialog to result in tickets Travis Ralston 2021-09-14 12:33:14 -06:00
  • 2fbdd737c9 Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 17:47:11 +00:00
  • f6b0b12c60 fix lockfile David Baker 2021-09-14 18:46:20 +01:00
  • 6972cb248f Merge remote-tracking branch 'upstream/develop' into task/remove-message_send_failed Šimon Brandner 2021-09-14 19:31:12 +02:00
  • 67d328c7fd Merge remote-tracking branch 'upstream/develop' into task/structures-ts Šimon Brandner 2021-09-14 19:30:52 +02:00
  • 1059643d3e Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 17:28:32 +00:00
  • fddc20dd89 Remove replies from hidden events when shown with messages.ViewSourceEvent (#6796) Eric Eastwood 2021-09-14 12:28:28 -05:00
  • 0f55fde03a Convert StatusMessageContextMenu to TS Šimon Brandner 2021-09-14 19:09:24 +02:00
  • 11e61075b4 Convert GenericTextContextMenu to TS Šimon Brandner 2021-09-14 18:59:54 +02:00
  • 8e4529d6ce Convert GenericElementContextMenu to TS Šimon Brandner 2021-09-14 18:58:20 +02:00
  • 5baaa6b77e Convert MemberStatusMessageAvatar to TS Šimon Brandner 2021-09-14 18:53:31 +02:00
  • c2192a78bc More lint James Salter 2021-09-14 18:16:48 +01:00
  • 6c1dea09e8 lint James Salter 2021-09-14 17:46:56 +01:00
  • 9b3da61ae4 Remove unnecessary unset Robin Townsend 2021-09-14 12:37:45 -04:00
  • 8824b12064 Fix alignment of sender name in message bubble replies Robin Townsend 2021-09-14 12:35:51 -04:00
  • 7344a177e3 Fix tests, swallow errors James Salter 2021-09-14 15:53:33 +01:00
  • c31fb79d46 Merge branch 'develop' into message-bubble-misc Robin Townsend 2021-09-14 12:31:58 -04:00
  • aab030d105 Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts Šimon Brandner 2021-09-14 18:29:41 +02:00
  • f5d8bb7cbe Remove awaiting setState() Šimon Brandner 2021-09-14 18:15:27 +02:00
  • ccc042b7d7 Where does that magic number come from? Šimon Brandner 2021-09-14 18:06:01 +02:00
  • 8e3be15365 Move animations into _animations Šimon Brandner 2021-09-14 18:05:15 +02:00
  • db25147a19 Remove message_send_failed as it was unused Šimon Brandner 2021-09-14 17:49:18 +02:00
  • 047767bab0 Improve typing Šimon Brandner 2021-09-14 17:38:34 +02:00
  • 2f6239770a Merge remote-tracking branch 'upstream/develop' into task/structures-ts Šimon Brandner 2021-09-14 17:32:00 +02:00
  • 2c0835ed9b Add comments to message bubble magic numbers Robin Townsend 2021-09-14 11:27:03 -04:00
  • 6b35146f84 v1.8.5 RiotRobot 2021-09-14 16:25:48 +01:00
  • 1659ce7624 changelog RiotRobot 2021-09-14 16:25:25 +01:00
  • b26bec949d Use React.Children.count() Šimon Brandner 2021-09-14 17:19:57 +02:00
  • c7aab2530b Merge branch 'release-v1.8.5' RiotRobot 2021-09-14 16:18:17 +01:00
  • b8ee2d2b5b Add warning that some spaces may not be relinked to the newly upgraded room Michael Telatynski 2021-09-14 16:14:25 +01:00
  • 7a72547133 v1.8.5 v1.8.5 origin/release-v1.8.5 RiotRobot 2021-09-14 16:07:08 +01:00
  • dd17148ce6 Prepare changelog for v1.8.5 RiotRobot 2021-09-14 16:07:08 +01:00
  • a40d7474f4 Upgrade matrix-react-sdk to 3.30.0 RiotRobot 2021-09-14 16:05:19 +01:00
  • 10a8d06546 Upgrade matrix-js-sdk to 12.5.0 RiotRobot 2021-09-14 16:04:22 +01:00
  • c4b1a9c1e5 Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 15:02:22 +00:00
  • 5a561b674f Fix space keyboard shortcuts conflicting with native zoom shortcuts Michael Telatynski 2021-09-14 16:02:15 +01:00
  • c786ef9f69 Fix space keyboard shortcuts conflicting with native zoom shortcuts Michael Telatynski 2021-09-14 16:02:14 +01:00
  • 85fea9cfd0 Merge branch 'master' into develop RiotRobot 2021-09-14 16:02:04 +01:00
  • 35171ccd23 Merge branch 'develop' into message-bubble-misc Robin Townsend 2021-09-14 11:00:55 -04:00
  • 36e8af2978 Merge branch 'release-v3.30.0' RiotRobot 2021-09-14 15:59:56 +01:00
  • 43fd8fa9f6 Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 14:56:25 +00:00
  • c3089a1097 v3.30.0 RiotRobot 2021-09-14 15:56:23 +01:00
  • 2eeb3cecd9 Prepare changelog for v3.30.0 RiotRobot 2021-09-14 15:56:22 +01:00
  • 9928079b82 Merge pull request #6797 from matrix-org/t3chguy/fix/19025 Michael Telatynski 2021-09-14 15:56:20 +01:00
  • 7e5ba5101f Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 14:55:48 +00:00
  • 1298fddebf Merge pull request #6800 from matrix-org/t3chguy/fix/18694 Michael Telatynski 2021-09-14 15:55:44 +01:00
  • 4ea0385061 Upgrade matrix-js-sdk to 12.5.0 RiotRobot 2021-09-14 15:54:30 +01:00
  • 9e73d8c976 Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 14:53:07 +00:00
  • 6900fb79c2 Merge pull request #6798 from matrix-org/t3chguy/fix/randoms Michael Telatynski 2021-09-14 15:53:02 +01:00
  • b0cb05bfe8 Merge branch 'origin/develop' into Weblate. Weblate 2021-09-14 14:52:45 +00:00
  • d875e429cc Translated using Weblate (Chinese (Simplified)) sr093906 2021-09-14 13:52:48 +00:00
  • 4a4c68b71c Merge pull request #6803 from matrix-org/t3chguy/fix/19034 Michael Telatynski 2021-09-14 15:52:37 +01:00
  • 919270ff0c Update src/stores/SpaceStore.tsx Michael Telatynski 2021-09-14 15:50:51 +01:00
  • 07d29f64fa Merge pull request #6802 from matrix-org/dbkr/18997_rel David Baker 2021-09-14 15:32:50 +01:00
  • d081d3af9e Merge pull request #6801 from matrix-org/dbkr/19012_rel_2 David Baker 2021-09-14 15:32:32 +01:00
  • a43f5507a3 Use a UUID instead of hashed user ID for tracking James Salter 2021-09-14 14:57:26 +01:00
  • 60f43f0171 Stop spinner on space preview if the join fails Michael Telatynski 2021-09-14 15:12:25 +01:00
  • cb6368f885 Fix autocomplete not having y-scroll Dariusz Niemczyk 2021-09-14 14:45:47 +02:00
  • 769c9cd780 Add a better comment describing the behavior Dariusz Niemczyk 2021-09-14 14:51:17 +02:00
  • 8505f292b2 Fix invalid ContextualMenu positions Dariusz Niemczyk 2021-09-13 22:11:58 +02:00
  • 6672be91a1 Simplify Space Panel layout Michael Telatynski 2021-09-14 15:00:44 +01:00
  • f59baf1efb Tidy some types Michael Telatynski 2021-09-14 14:41:55 +01:00
  • 5048e41e8b Space Hierarchy react to known local rooms changing names Michael Telatynski 2021-09-14 14:41:51 +01:00