Commit graph

  • d93b47cf2c Merge branch 'pleroma-double_mentions' into 'develop' lain 2023-06-11 13:04:59 +0000
  • 6611c6ce4e B ForceMentionsInContent: Fix test, refactor. Lain Soykaf 2023-06-11 16:45:31 +0400
  • 55dd8ef1c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-double_mentions Lain Soykaf 2023-06-11 16:31:20 +0400
  • 22878cf84a B Migrations: Don't remove activity_visibility_index for now. Lain Soykaf 2023-06-11 16:22:16 +0400
  • 10dfa107d5 Update changelog Lain Soykaf 2023-06-11 16:22:03 +0400
  • 175ee9e6fe Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unused_indexes Lain Soykaf 2023-06-11 16:20:30 +0400
  • 16313af7eb Merge branch 'fix/metadata-tags' into 'develop' lain 2023-06-11 11:57:16 +0000
  • 1f4618d64b Merge branch 'cleanup/ostatus-user-upgrade' into 'develop' lain 2023-06-11 11:13:57 +0000
  • 75900f21f0 Merge branch 'revert-mediaproxy-host-validation' into 'develop' feld 2023-06-11 11:10:51 +0000
  • 1db29f734f Merge branch 'fep-fffd-url' into 'develop' lain 2023-06-11 11:02:39 +0000
  • b762a7503c Merge branch 'distro-docs-elixir-1.11' into 'develop' lain 2023-06-11 10:42:22 +0000
  • 60a5a9e60e Merge branch 'weblate-extract' into 'develop' weblate bot 2023-06-08 19:35:34 +0000
  • 0d25bec551 Merge branch 'features/ingestion-unfollow' into 'develop' Haelwenn 2023-06-08 15:49:55 +0000
  • 223cd5b6fe Merge branch 'media-preview-proxy' into 'develop' Ivan Tashkinov 2023-06-08 13:08:07 +0000
  • 5e871071f4 Merge branch 'sal/add-setup-instructions' into 'develop' Salvatore Testa 2023-06-08 08:37:10 +0000
  • 503e5e8969 Merge branch 'mrf-tuples-fix' into 'develop' Alex Gleason 2023-06-08 07:55:03 +0000
  • 0b80147a58 Merge branch 'frontend-caching' into 'develop' feld 2023-06-08 07:41:30 +0000
  • c0c45c97e4 Merge branch 'from/upstream-develop/tusooa/alt-domain' into 'develop' tusooa 2023-06-08 07:37:06 +0000
  • 9f3fe1faa5 Merge branch 'default_gl_templates' into 'develop' Ilja 2023-06-08 07:36:59 +0000
  • f26bc1e2ba Merge branch 'from/upstream-develop/tusooa/2738-misskey-drive' into 'develop' tusooa 2023-06-08 07:36:57 +0000
  • 6813cb8275 Merge branch 'steal_emoji_policy__add_accepted_shortcodes_list' into 'develop' Ilja 2023-06-08 07:36:30 +0000
  • 56fcaa2b36 Extract translatable strings weblate-extract weblate-extractor 2023-06-08 06:09:10 +0000
  • 8597c4b0c9 Merge branch 'fix_flaky_nil_provided_to_functions_who_expect_string' into 'develop' Ilja 2023-06-08 01:58:19 +0000
  • cfc973db75 Merge branch 'secure-mode' into 'develop' marcin mikołajczak 2023-06-07 21:27:40 +0000
  • 3ba5d77035 Merge branch 'unused_indexes' into 'develop' feld 2023-06-07 15:29:54 +0000
  • 39845d1b61 Merge branch 'instance-nodeinfo-metadata' into 'develop' Haelwenn 2023-06-07 15:21:02 +0000
  • 5deff1be6c Merge branch 'fix-otp-documentation' into 'develop' Duponin 2023-06-07 14:03:56 +0000
  • 5f81ab7768 Merge branch 'revert-mediaproxy-host-validation' into 'develop' feld 2023-06-07 13:26:06 +0000
  • 1ca1b4b32f changelog.d revert-mediaproxy-host-validation Mark Felder 2023-06-07 09:25:57 -0400
  • fadcd7f1a9 Revert MediaProxy Host header validation Mark Felder 2023-06-07 09:19:22 -0400
  • aea1cd6fb8 Merge branch 'new_users_digest' into 'develop' feld 2023-06-07 12:40:30 +0000
  • cf63faf3ee Merge branch 'fep-fffd-url' into 'develop' Haelwenn 2023-06-07 12:15:25 +0000
  • 14bc8e5027 Merge branch 'cleanup/ostatus-user-upgrade' into 'develop' Haelwenn 2023-06-07 11:50:23 +0000
  • 8ee9be60a6 Merge branch 'fix-386' into 'develop' Duponin 2023-06-07 11:08:46 +0000
  • e4f1932e1e Merge branch 'remove-scrobbles' into 'develop' Haelwenn 2023-06-07 11:04:27 +0000
  • 17f356d6fc Merge branch 'csp-flash' into 'develop' HJ 2023-06-07 11:04:25 +0000
  • fa306f0d36 Merge branch 'revoke_tokens' into 'develop' marcin mikołajczak 2023-06-07 11:04:21 +0000
  • 0d60c7b2be Merge branch 'distro-docs-elixir-1.11' into 'develop' Haelwenn 2023-06-07 11:04:20 +0000
  • b646287fa0 Merge branch 'fix/metadata-tags' into 'develop' faried nawaz 2023-06-07 08:34:58 +0000
  • 04d2757c2d Merge branch 'double_mentions' into 'develop' Zero 2023-06-07 06:37:20 +0000
  • f14676be9c Merge branch 'meilisearch' into 'develop' vaartis 2023-06-06 18:14:10 +0000
  • 0781d42da2 Merge branch 'features/mrf-id_filter' into 'develop' Haelwenn 2023-06-06 16:34:33 +0000
  • 20294f8451 Merge branch 'tusooa/3054-banned-delete' into 'develop' tusooa 2023-06-06 15:08:12 +0000
  • 3a9803a8e1 Merge branch 'tusooa/media-altdomain' into 'develop' tusooa 2023-06-06 15:08:12 +0000
  • 28712011a7 Merge branch 'tusooa/3119-bio-update' into 'develop' tusooa 2023-06-06 15:08:11 +0000
  • 81ee314bd5 Merge branch 'fix/start-pleroma-mix-tasks' into 'develop' h3poteto 2023-06-06 13:43:16 +0000
  • ff18ebbf54 Merge branch 'phoenix1.7' into 'develop' feld 2023-06-06 13:31:52 +0000
  • 36e4e95ac8 Merge branch 'vips' into 'develop' feld 2023-06-06 13:31:23 +0000
  • 43458cb7a1 Merge branch 'preload-escaping' into 'develop' lain 2023-06-06 13:31:08 +0000
  • cee495967c Merge branch 'feat/transcode-video-upload-filter' into 'develop' Igor Rogatty 2023-06-06 06:28:22 +0000
  • 6909ad4b2a Merge branch 'fix/user-delete' into 'develop' feld 2023-06-06 06:28:01 +0000
  • b0322b8aee Merge branch 'feature/mrf_auto_subject' into 'develop' feld 2023-06-06 06:27:42 +0000
  • e3a221b100 Merge branch 'tusooa/2775-emoji-policy' into 'develop' tusooa 2023-06-06 05:43:32 +0000
  • 1db0481f1d Merge branch 'webhooks_' into 'develop' marcin mikołajczak 2023-06-04 11:38:41 +0000
  • 8ea3596ebd Merge branch 'tusooa/more-translatable' into 'develop' tusooa 2023-06-04 11:13:43 +0000
  • ebee9688b8 Merge branch 'from/upstream-develop/tusooa/restrict-deactivated-announce' into 'develop' tusooa 2023-06-04 11:13:29 +0000
  • d6bfd81fb2 Merge branch 'pin-chats' into 'develop' marcin mikołajczak 2023-06-04 11:11:41 +0000
  • 717b23e838 Merge branch 'fix/oban_2_log' into 'develop' meowski 2023-06-04 11:07:16 +0000
  • e58030b5f3 Merge branch 'feat/mrf-dnsrbl' into 'develop' feld 2023-06-04 10:49:07 +0000
  • 3cc064526f Merge branch 'display-name' into 'develop' Sean King 2023-06-04 10:32:20 +0000
  • 9bddb23c6a Merge branch 'fix/streaming-with-irreversible-filter' into 'develop' kPherox 2023-06-04 09:03:28 +0000
  • 63ef1dcedc Phoenix.Router.routes/1 is the public function we are meant to be using here phoenix1.7 Mark Felder 2023-06-03 14:17:49 -0400
  • c665d53295 Update to Phoenix 1.7 Mark Felder 2023-06-03 14:04:12 -0400
  • bcd7ccac11 Support a type called "change" Mark Felder 2023-06-03 14:03:51 -0400
  • 115ddba33a Merge branch 'from/upstream-develop/tusooa/backup-status' into 'develop' tusooa 2023-06-03 14:04:38 +0000
  • 4f5c24bfba Merge branch 'disable-instance-preload' into 'develop' feld 2023-06-03 13:29:40 +0000
  • 9701af0502 Merge branch 'restrict-unauthorized-forcefetch' into 'develop' mint 2023-06-03 07:54:40 +0000
  • bbe4646d3c Merge branch 'fix/2927-disallow-unauthenticated-access' into 'develop' faried nawaz 2023-06-02 20:48:15 +0000
  • 86b38dd14b Merge branch 'develop' into 'phoenix1.7' feld 2023-06-02 15:41:40 +0000
  • 2e45be2653 Add :phoenix to extra_applications to suppress a warning Mark Felder 2023-06-02 11:34:04 -0400
  • 0283781411 Merge branch 'preload-escaping' into 'develop' lain 2023-06-02 13:10:14 +0000
  • 40d40d67a3 Add changelog. Lain Soykaf 2023-06-02 17:09:23 +0400
  • cbc5b8cebd B Preload: Make sure that the preloaded json is html safe Lain Soykaf 2023-06-02 17:03:21 +0400
  • 8524e04db5 Merge branch 'followers-export' into 'develop' feld 2023-06-02 08:04:06 +0000
  • 2e2f722131 Merge branch 'fix-463' into 'develop' Duponin 2023-06-02 07:58:41 +0000
  • c1a933e5c9 Merge branch 'status-notification-type' into 'develop' marcin mikołajczak 2023-06-02 07:52:16 +0000
  • d108ec2404 Merge branch 'image-description-summary' into 'develop' Haelwenn 2023-06-02 07:07:31 +0000
  • 1b66fcbd2c Merge branch 'nsfw-api-mrf' into 'develop' Alex Gleason 2023-06-02 02:12:35 +0000
  • e8d3525665 Merge branch 'bump-gettext' into 'develop' Haelwenn 2023-06-02 01:38:41 +0000
  • e7713e7756 Merge branch 'bump-gettext' into 'develop' Haelwenn 2023-06-02 01:06:42 +0000
  • 313e68c180 mix: bump gettext to ~0.20 Haelwenn (lanodan) Monnier 2023-01-06 21:53:17 +0100
  • e2a63dadd1 Merge branch 'test_improvement' into 'develop' Haelwenn 2023-06-01 09:40:25 +0000
  • c9cb90ff4f
    Media proxy base URL doesn't need /proxy tusooa/media-altdomain Sean King 2023-05-31 17:49:06 -0600
  • f0e5f0e837 Fix compile warning Mark Felder 2023-05-31 22:14:55 +0000
  • 2b8bbb288c Phoenix.Socket.Transport.force_ssl/4 no longer exists Mark Felder 2023-05-31 22:11:17 +0000
  • d9f031c9da Bump minimum Elixir to 1.12 Mark Felder 2023-05-31 21:11:13 +0000
  • ba988a9abc Fix test warnings Mark Felder 2023-05-31 16:30:31 -0400
  • 62322f71e2 Clean up Plug.Parsers.MULTIPART deprecation warnings Mark Felder 2023-05-31 16:22:40 -0400
  • ffee478ed0 Move websocket config for Shoutbox to the Endpoint Mark Felder 2023-05-31 15:30:58 -0400
  • 4dc2d4bf7b Remove locked version of plug Mark Felder 2023-05-31 15:30:31 -0400
  • a2bbd7c9da
    Fix base media and proxy URL in instructions to serve media on another domain Sean King 2023-05-31 12:22:13 -0600
  • a7e7db4a29 Phoenix.Endpoint.Cowboy2Handler -> Plug.Cowboy.Handler Mark Felder 2023-05-31 13:47:15 -0400
  • f622f82c0e No user facing changes Mark Felder 2023-05-31 13:38:46 -0400
  • e3110cb34e Fix deprecated calls to get_flash/2 Mark Felder 2023-05-31 13:36:21 -0400
  • 6e1ea2eafc Remove unnecessary compilers as of Phoenix 1.7 Mark Felder 2023-05-31 13:36:07 -0400
  • bed44f9f62 Update to Phoenix 1.7 Mark Felder 2023-05-31 13:10:18 -0400
  • 4732fc4a28 Use response_content_type test assertion from Phoenix.ConnTest media-mime-filter Mark Felder 2023-05-31 10:31:22 -0400
  • 33d566f2ac Switch to filtering out various xml and html types by focusing on the subtype Mark Felder 2023-05-31 10:24:51 -0400
  • 70023a1571 Fix scrubbing for files served by Plug.Static Mark Felder 2023-05-31 10:20:13 -0400
  • 2f7f104231 Merge branch 'test_improvement' into 'develop' feld 2023-05-31 13:54:47 +0000