Commit Graph

  • d720be3b20 Merge remote-tracking branch 'upstream/develop' into neckbeard neckbeard Your New SJW Waifu 2024-03-18 16:15:10 -0500
  • 0e4e20315b Merge branch 'bookmark-folders' into 'develop' lain 2024-03-18 14:26:19 +0000
  • 60c4cb21ea InstanceView: Update features marcin mikołajczak 2024-03-18 13:54:15 +0100
  • 2b71f4897f Merge branch 'develop' into 'bookmark-folders' lain 2024-03-18 10:35:02 +0000
  • cf0aa1238c Merge branch 'public-polls' into 'develop' lain 2024-03-18 06:26:22 +0000
  • 4f7f44ced1 Merge branch 'develop' into 'develop' lain 2024-03-17 20:17:04 +0000
  • a48f5f860e Notifications: filter on users rather than activities Matthieu Rakotojaona 2024-03-13 13:46:37 +0100
  • d5b64846ed Merge branch 'remove-rum-tests' into 'develop' lain 2024-03-17 16:33:26 +0000
  • 56e456fb5b Merge branch 'fix-3241' into 'develop' lain 2024-03-17 13:38:59 +0000
  • caf855cf9c ActivityPub.Publisher: Don't try federating if a user doesn't have an inbox. Lain Soykaf 2024-03-17 16:57:45 +0400
  • 0450da88b6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-fix-3241 Lain Soykaf 2024-03-17 16:42:17 +0400
  • 95bcd5d28f Merge branch 'force-mention' into 'develop' lain 2024-03-17 12:32:14 +0000
  • f0cca36e07 CI: Remove RUM tests. Lain Soykaf 2024-03-17 15:39:24 +0400
  • 0b5bba23ce Merge branch 'backups' into 'develop' feld 2024-03-15 19:32:35 +0000
  • bb0b17f4d9 Include following/followers in backups marcin mikołajczak 2024-03-07 20:14:05 +0100
  • df7a8d4efe Merge branch 'instance-contact-account' into 'develop' tusooa 2024-03-10 13:14:19 +0000
  • 965ce9ae57 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2024-03-10 07:58:37 -0500
  • 72daf522c9 Merge branch 'fix-framegrabs' into 'develop' feld 2024-03-08 14:48:26 +0000
  • c0c4a9ed0d Merge remote-tracking branch 'origin/develop' into instance-contact-account marcin mikołajczak 2024-03-08 12:12:55 +0100
  • 139057f346 Merge branch 'link-verification' into 'develop' tusooa 2024-03-08 00:52:09 +0000
  • 5eee6cdb5b Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2024-03-07 17:17:44 -0600
  • 54ff7234b9 Fix ffmpeg framegrabs with Exile Mark Felder 2024-03-07 17:38:21 -0500
  • 961a5dd4cd Add test marcin mikołajczak 2024-03-07 13:32:50 +0100
  • b7c625db0f Merge remote-tracking branch 'origin/develop' into link-verification marcin mikołajczak 2024-03-07 13:13:49 +0100
  • 47ce33a90d Apply tusooa's suggestion tusooa 2024-03-07 11:55:31 +0000
  • 1422082bf2 Apply ledyba's suggestion(s) to 1 file(s) tusooa 2024-03-07 04:43:56 +0000
  • 8298b326a7 Merge branch 'instance-v2' into 'develop' tusooa 2024-03-07 01:31:27 +0000
  • 0242c1f691 fmt Kaede Fujisaki 2024-03-02 18:34:12 +0900
  • 1311f8314e add changelog.d Kaede Fujisaki 2024-03-02 18:24:39 +0900
  • fb1873b6ec add changelog.d Kaede Fujisaki 2024-03-02 18:23:56 +0900
  • 2e548c31d4 Add changelog Kaede Fujisaki 2024-03-02 18:13:36 +0900
  • 6ad4acea50 Consider a case when inbox is nil Kaede Fujisaki 2024-03-02 18:09:08 +0900
  • 9cfa4e67b1 Add ForceMention mrf marcin mikołajczak 2024-03-01 18:14:31 +0100
  • d415686bb9 Allow to group bookmarks in folders marcin mikołajczak 2024-02-26 23:45:02 +0100
  • d16503bb5f Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2024-02-28 14:07:53 -0600
  • acb9e46074 Add some missing fields to instanceV2 marcin mikołajczak 2024-02-27 13:25:26 +0100
  • 03e54aaba9 Merge branch 'remote-fetcher-error' into 'develop' Haelwenn 2024-02-24 11:37:34 +0000
  • bd4d2e1d83 Merge branch 'exile-freebsd' into 'develop' feld 2024-02-23 20:52:04 +0000
  • 267e20dbcd Exile: change to upstream pre-release commit that fixes build on FreeBSD Mark Felder 2024-02-23 15:36:07 -0500
  • 6144cb43a8 Merge branch 'gun-pool-retry' into 'develop' feld 2024-02-23 16:44:53 +0000
  • f4e48bc53e Rename variable to make the worker retry logic easier to read Mark Felder 2024-02-23 11:12:10 -0500
  • 00e828b1a0 Merge branch 'gun-pool-retry' into 'develop' Haelwenn 2024-02-23 06:47:56 +0000
  • 6af6a9704d
    RemoteFetcherWorker: Make sure {:error, _} is returned on failure Haelwenn (lanodan) Monnier 2024-02-23 01:57:43 +0100
  • c592a0e58d Merge remote-tracking branch 'origin/develop' into HEAD marcin mikołajczak 2024-02-22 11:59:15 +0100
  • 72fc41d891 Prevent publisher jobs from erroring if the connection pool is full Mark Felder 2024-02-22 14:11:02 -0500
  • ac55764599 Gun Connection Pool was not attempting to free a connection and retry once if the pool was full. Mark Felder 2024-02-22 14:07:46 -0500
  • e82d1f9605 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2024-02-20 08:24:59 -0600
  • f0468697cd Merge branch 'mergeback/2.6.2' into 'develop' Haelwenn 2024-02-20 10:52:46 +0000
  • e149ee6e22
    Mergeback of security release 2.6.2 Haelwenn (lanodan) Monnier 2024-02-20 09:16:36 +0100
  • 7d624c4750
    StealEmojiPolicy: Sanitize shortcodes Haelwenn (lanodan) Monnier 2024-02-20 08:45:48 +0100
  • 5eeb7d51cf added new mrfs for spam https://declin.eu/objects/7bc064c4-a703-4195-aa63-975f10661978 Your New SJW Waifu 2024-02-19 15:03:43 -0600
  • 6b75245a78 fix Your New SJW Waifu 2024-02-18 12:43:52 -0600
  • af34602a4b spam https://poa.st/objects/75c7cb92-1de4-4131-92e7-875a27a3d345 Your New SJW Waifu 2024-02-18 12:39:51 -0600
  • 6078d63f4a Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2024-02-18 12:37:26 -0600
  • 0b9bc4a0d0 Merge branch 'memleak' into 'develop' feld 2024-02-17 16:21:55 +0000
  • 7e99d0619d Force more frequent full_sweep GC runs on the Websocket processes Mark Felder 2024-02-12 17:25:02 -0500
  • a145d909b5 Merge branch 'weblate' into 'develop' Haelwenn 2024-02-16 18:28:55 +0000
  • 2c9fed9b73 Translated using Weblate (Japanese) SyoBoN 2024-02-16 02:41:14 +0000
  • 0fbec6b532 Merge branch 'deps-changelog-revert' into 'develop' feld 2024-02-16 17:53:52 +0000
  • 1951d56ed9 Revert "Add support for a "deps" changelog type and document deps changes since 2.6.1 release" Mark Felder 2024-02-16 12:53:18 -0500
  • c9cd449bba Revert "Support a new changelog entry type: deps" Mark Felder 2024-02-16 12:51:39 -0500
  • 03834454d9 Merge branch 'tesla' into 'develop' feld 2024-02-15 15:27:34 +0000
  • 2a4fa4c408 Add support for a "deps" changelog type and document deps changes since 2.6.1 release Mark Felder 2024-02-15 10:20:52 -0500
  • 772f8d08cf Tesla changelog Mark Felder 2024-02-15 10:07:30 -0500
  • 4648997a10 Support a new changelog entry type: deps Mark Felder 2024-02-15 10:06:37 -0500
  • b91317b9bf Merge branch 'bandit' into 'develop' feld 2024-02-15 15:23:41 +0000
  • 202721e80c Remove Cowboy-specific HTTP options Mark Felder 2024-02-15 09:46:08 -0500
  • 0c5bec0493 Support Bandit as an alternate HTTP backend to Cowboy. This is currently considered experimental, but may improve performance and resource usage. Mark Felder 2024-02-15 09:45:48 -0500
  • 4dd8a1a1ca Merge branch 'websocket-refactor' into 'develop' feld 2024-02-15 14:36:54 +0000
  • d3208d2250 Merge branch 'oauth-nickname' into 'develop' lain 2024-02-15 09:35:39 +0000
  • f2f455f283 Merge branch 'frontend-caching' into 'develop' lain 2024-02-15 09:23:47 +0000
  • f28dcc9cb7 Merge branch 'config-stat-symlink' into 'develop' Haelwenn 2024-02-15 01:48:03 +0000
  • d19642d7eb Merge branch 'bugfix-ccworks' into 'develop' Haelwenn 2024-02-15 01:30:22 +0000
  • 802c618885 Merge branch 'atom-leaks' into 'develop' feld 2024-02-14 23:28:00 +0000
  • 9138754b0a Changelog Mark Felder 2024-02-14 18:04:39 -0500
  • 91c83a82a0 Fix atom leak in background worker Mark Felder 2024-02-14 17:58:36 -0500
  • 86e6d395d9 Fix atom leak in password digest functionality Mark Felder 2024-02-14 17:54:56 -0500
  • 6be129ead2 Websocket refactor changelog Mark Felder 2024-02-14 14:19:24 -0500
  • d0f4b2b02f Remove invalid test Mark Felder 2024-02-14 14:15:24 -0500
  • 64ad451a7b Websocket refactor to use Phoenix.Socket.Transport Mark Felder 2024-02-13 19:21:45 -0500
  • af9bb77cad Merge branch 'gun-logs' into 'develop' feld 2024-02-14 18:57:11 +0000
  • 1b2f9d4a6d Merge branch 'proxy-headers' into 'develop' feld 2024-02-14 18:56:54 +0000
  • 9a4c8e2316 Change some Gun connection pool logs to debug level Mark Felder 2024-02-14 13:28:32 -0500
  • 60ba6fd244 MediaProxy RFC compliance Mark Felder 2024-02-14 13:25:52 -0500
  • 3b82864bcc
    Config: Check the permissions of the linked file instead of the symlink↵ Haelwenn (lanodan) Monnier 2024-02-14 18:16:54 +0100
  • 8767413197 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2024-02-13 17:25:36 -0600
  • 79d69ce72a Merge branch 'gitignore' into 'develop' feld 2024-02-12 22:23:31 +0000
  • 67c3acde34 Update .gitignore Mark Felder 2024-02-12 17:22:57 -0500
  • 769e02d0de Merge branch 'notifications-query' into 'develop' feld 2024-02-12 19:37:17 +0000
  • cb4d3db8c6 Changelog for notifications fix pulled in from Rebased Mark Felder 2024-02-12 14:14:38 -0500
  • 8daf19ec0f Fix notifications index Alex Gleason 2024-02-12 12:39:47 -0600
  • 991807080b Merge branch 'gun-fix' into 'develop' feld 2024-02-09 16:48:05 +0000
  • 0eca3e38eb Fix Gun connection supervisor logic error Mark Felder 2024-02-09 10:36:58 -0500
  • 0fcdcc2300 Use User.full_nickname/1 in oauth html template marcin mikołajczak 2024-02-07 17:55:52 +0100
  • 72480e7b2f Merge branch 'rich-media-tests' into 'develop' feld 2024-02-07 05:47:38 +0000
  • 9f2319e50d RichMedia.Helpers: move the validate_page_url/1 function to the Parser module Mark Felder 2024-02-06 16:54:52 -0500
  • 6b7b443ff9 Pleroma.Web.RichMedia.Parser: Remove test-specific codepaths Mark Felder 2024-02-06 14:34:59 -0500
  • 78f816b822 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2024-02-06 11:36:27 -0600
  • e957362779 Merge branch 'rich-media-cache' into 'develop' feld 2024-02-05 05:58:07 +0000
  • 0cc038b67c Ensure URLs with IP addresses for the host do not generate previews Mark Felder 2024-02-05 00:09:37 -0500