Commit graph

  • 44be498fe1 Merge branch 'optional-config' into 'develop' lain 2021-05-17 18:41:12 +0000
  • 7ac4da8dd4
    Merge remote-tracking branch 'pleroma/develop' into gitignore-runtime-exs Alex Gleason 2021-05-16 13:22:26 -0500
  • 230ad82dad
    gitignore config/runtime.exs Alex Gleason 2021-05-16 13:22:07 -0500
  • 32ae8f4906
    Merge remote-tracking branch 'pleroma/develop' into optional-config Alex Gleason 2021-05-16 12:27:29 -0500
  • b540fff908
    Docs: use MIX_ENV=prod mix pleroma.instance gen Alex Gleason 2021-05-16 12:20:20 -0500
  • b22f54eb29
    Make prod.secret.exs optional (with warning) Alex Gleason 2021-05-16 12:26:32 -0500
  • bcf6efce15
    Merge remote-tracking branch 'upstream/attachment-meta' into blurhash Alex Gleason 2021-05-14 09:09:32 -0500
  • 543e9402d6
    Support blurhash Alex Gleason 2021-05-14 08:38:23 -0500
  • 5a57b025c7
    Changelog: attachment meta Alex Gleason 2021-05-12 20:15:33 -0500
  • ff02511057
    Merge remote-tracking branch 'upstream/develop' into attachment-meta Alex Gleason 2021-05-12 20:10:52 -0500
  • 6f0b42656d
    Federate attachments as Links instead of Documents Alex Gleason 2021-05-12 19:03:10 -0500
  • 02b9436494
    Don't render media meta if nil Alex Gleason 2021-05-12 16:16:10 -0500
  • 4c060ae733
    Ingest remote attachment width/height Alex Gleason 2021-05-12 15:38:49 -0500
  • ab9eabdf20
    Add SetMeta filter to store uploaded image sizes Alex Gleason 2021-05-12 13:38:11 -0500
  • 50a644a221 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2021-05-12 16:13:30 +0100
  • 5be9d13981
    a better query to delete from hashtags faried nawaz 2021-04-21 03:52:32 +0500
  • a0c9a2b4cc
    mix prune_objects: remove unused hashtags after pruning remote objects faried nawaz 2021-04-21 02:38:59 +0500
  • 22b2451edd
    migration: add on_delete: :delete_all to hashtags object_id fk faried nawaz 2021-04-21 02:37:03 +0500
  • cea44b6b3e
    Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak Alex Gleason 2021-05-07 12:40:45 -0500
  • b15c4629ff
    CHANGELOG: notice routes Alex Gleason 2021-05-05 14:36:27 -0500
  • 1a45aa1278
    Merge remote-tracking branch 'pleroma/develop' into notice-routes Alex Gleason 2021-05-05 14:50:54 -0500
  • 50e3750758
    Add notice compatibility routes for other frontends Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/1785 Alex Gleason 2021-05-05 13:58:50 -0500
  • 745375bdcf Merge branch 'dont-crash-email-settings' into 'develop' feld 2021-05-04 13:30:00 +0000
  • d5263bfcf3 Merge branch 'earmark' into 'develop' feld 2021-05-04 13:29:14 +0000
  • 90770e0841
    CHANGELOG: don't crash so hard when email settings are invalid Alex Gleason 2021-05-03 14:30:21 -0500
  • c186b059a7
    Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings Alex Gleason 2021-05-03 14:43:28 -0500
  • c80b1aaf51
    Don't crash when email settings are invalid Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606 Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4 Alex Gleason 2021-05-03 14:27:03 -0500
  • dca87c5e7b
    CHANGELOG: markdown Alex Gleason 2021-05-01 11:28:06 -0500
  • 20878c7f99
    CHANGELOG: SimplePolicy embedded objects are now checked Alex Gleason 2021-04-02 12:18:35 -0500
  • 926a233cc4
    Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak Alex Gleason 2021-04-30 14:21:17 -0500
  • c16c7fdb87
    SimplePolicy: filter string Objects Alex Gleason 2021-04-29 11:51:49 -0500
  • 3d742c3c1a
    SimplePolicy: filter nested objects Alex Gleason 2021-03-18 15:31:50 -0500
  • 52fc59f125
    Merge remote-tracking branch 'upstream/develop' into earmark Alex Gleason 2021-04-30 13:17:03 -0500
  • a8fa00ef66
    Fix failing remote mentions test, valid TLDs Alex Gleason 2021-04-30 12:55:43 -0500
  • 53760d2cda
    Delete obsolete EarmarkRendereTests (moved to UtilsTest) Alex Gleason 2021-04-30 12:51:18 -0500
  • 6727a3659f
    Remove Pleroma.Formatter.minify/2 Alex Gleason 2021-04-30 12:27:06 -0500
  • 004bcedb07
    Upgrade Earmark 1.4.15 Alex Gleason 2021-04-30 12:23:11 -0500
  • 377f84f367 Merge branch 'oauth-token-id' into 'develop' feld 2021-04-29 19:13:50 +0000
  • 6bc8ab225d
    Merge remote-tracking branch 'upstream/develop' into oauth-token-id Alex Gleason 2021-04-29 14:06:12 -0500
  • 2fe3bd8178 Merge branch 'maybe-fix-ci' into 'develop' feld 2021-04-29 18:56:28 +0000
  • b5ae826898
    CI: Purge pleroma build directory between runs Alex Gleason 2021-04-29 13:03:41 -0500
  • 8c1d6e8839
    CHANGELOG: Return OAuth token id Alex Gleason 2021-04-29 12:20:46 -0500
  • e7ac15905e
    Merge remote-tracking branch 'upstream/develop' into oauth-token-id Alex Gleason 2021-04-29 12:19:10 -0500
  • 762be6ce10
    Merge remote-tracking branch 'upstream/develop' into block-behavior Alex Gleason 2021-04-29 11:14:32 -0500
  • 115673bce7 Merge branch 'gitlab-ci-mix-lock' into 'develop' Haelwenn 2021-04-28 04:53:25 +0000
  • b9a99ac0d4
    Cache gitlab-ci based on mix.lock Alex Gleason 2021-04-27 11:54:28 -0500
  • d9e782c180 Merge branch 'fix/delete_activities_timeout' into 'develop' Haelwenn 2021-04-23 02:14:11 +0000
  • d7a71a275a Fixed pleroma.user delete_activities mix task. Mark Felder 2021-04-22 10:15:05 -0500
  • 959dc6e6fc Cleanup and ensure we obey custom Repo timeout Mark Felder 2021-04-22 10:11:08 -0500
  • 99fd9c5e38 OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval Mark Felder 2021-04-20 12:00:02 -0500
  • 9f711ddcf8 Try to set query timeout intelligently Mark Felder 2021-04-20 11:16:24 -0500
  • 9bc69196d5 Add utility function to return infinite timeout for SQL transactions if we detect it was called from a Mix Task Mark Felder 2021-04-20 11:10:39 -0500
  • 0effcd2cfe Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task. Mark Felder 2021-04-19 15:43:17 -0500
  • f9bedf5597 Apply lanodan's suggestion(s) to 1 file(s) Haelwenn 2021-04-20 21:08:31 +0000
  • 42185d8750 Apply lanodan's suggestion(s) to 1 file(s) Haelwenn 2021-04-20 21:06:45 +0000
  • e104829c2f Apply lanodan's suggestion(s) to 1 file(s) Haelwenn 2021-04-20 21:06:39 +0000
  • 30b1d50938 Apply lanodan's suggestion(s) to 1 file(s) Haelwenn 2021-04-20 21:06:32 +0000
  • b050adb5e2 Merge branch 'fix/docs' into 'develop' feld 2021-04-20 18:02:48 +0000
  • 7eded72189 Fix incorrect shell command Mark Felder 2021-04-20 12:31:14 -0500
  • 8defbe431e Merge branch 'feature/opt-out-of-google-floc' into 'develop' feld 2021-04-19 22:39:52 +0000
  • 2780cdd4e7
    Add CHANGELOG entry Sean King 2021-04-19 16:06:19 -0600
  • d1eb1913e8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/opt-out-of-google-floc Sean King 2021-04-19 15:42:38 -0600
  • 7183655a07 Merge branch 'fix/tests' into 'develop' feld 2021-04-19 21:34:38 +0000
  • efed94a23e Fix error response which was breaking tests related to pinned posts Mark Felder 2021-04-19 16:23:57 -0500
  • 2b4f958b2a
    Add opting out of Google FLoC to HTTPSecurityPlug headers Sean King 2021-04-18 14:00:18 -0600
  • 2de41770d0
    Remove Twemoji stuff from MastoFE Sean King 2021-04-16 18:02:08 -0600
  • 0f8da39b72
    Remove priv/static/sounds folder Sean King 2021-04-16 15:56:00 -0600
  • a787fed8f7
    Move changelog around Sean King 2021-04-16 15:50:17 -0600
  • c6dcd863e2 Apply rinpatch's suggestion(s) to 1 file(s) rinpatch 2021-04-16 09:59:50 +0000
  • 15f87cf658 Merge branch 'features/ingestion-ecto-tag' into 'develop' rinpatch 2021-04-16 09:55:55 +0000
  • 79376b4afb Merge branch 'feature/521-pinned-post-federation' into 'develop' rinpatch 2021-04-16 09:53:47 +0000
  • 0ababdc068 Merge branch 'fix/2593-reading-exported-config-file' into 'develop' rinpatch 2021-04-16 09:50:26 +0000
  • fa2e62078c
    Remove MastoFE configuration stuff Sean King 2021-04-15 23:51:04 -0600
  • 08694599ae
    Remove bash script for downloading new MastoFE build Sean King 2021-04-15 23:41:34 -0600
  • bf9c4f5289
    Add note about Mastodon FE being removed from Pleroma in changelog Sean King 2021-04-15 23:39:33 -0600
  • f3b403fa98
    Remove MastoFE stuff from docs and default panel Sean King 2021-04-15 23:37:18 -0600
  • ca79aab0bf
    Remove MastoFE settings from users table Sean King 2021-04-15 23:33:24 -0600
  • 8afa3f2d1b
    Remove no longer necessary unit tests for MastoFE Sean King 2021-04-15 23:12:42 -0600
  • 4f55d5123b
    Remove MastoFE-related backend code and frontend pieces Sean King 2021-04-15 22:56:21 -0600
  • 152cb3074e Merge branch 'fix/notifsettings-breaking-login' into 'develop' Haelwenn 2021-04-15 21:34:55 +0000
  • 0a7c2a32ba Merge branch 'develop' into 'fix/notifsettings-breaking-login' feld 2021-04-15 14:59:26 +0000
  • 0ba8efc950 Merge branch 'fix/mastodon-interface-docs-link' into 'develop' Haelwenn 2021-04-15 05:44:01 +0000
  • d9fce0133e
    Fix Mastodon interface link Sean King 2021-04-14 14:01:33 -0600
  • 1bf2b645c5 Merge branch 'fix/adminapi-concurrent-limiter' into 'develop' feld 2021-04-14 16:52:02 +0000
  • f95b52255b Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test Mark Felder 2021-04-14 09:39:57 -0500
  • c3b8c77967 Improve string_to_elixir_types/1 with guards Mark Felder 2021-04-13 14:25:15 -0500
  • 861f192852 Document fixed ability to save ConcurrentLimiter settings in ConfigDB Mark Felder 2021-04-13 14:39:44 -0500
  • ee53ad4d77 Add ConcurrentLimiter to module_name?/1 and apply string_to_elixir_types/1 to search_opts keys during update_or_create/1 Mark Felder 2021-04-13 12:09:18 -0500
  • 905efc57e9 Initial test validating the AdminAPI issue Mark Felder 2021-04-13 11:15:52 -0500
  • d2a03d3c86 Merge branch 'fix/instance-thumbnail-url' into 'develop' Haelwenn 2021-04-13 19:05:07 +0000
  • cdd271b065 Fix assignment / assertion Mark Felder 2021-04-13 10:55:54 -0500
  • 9fbcdc15b1 Validate custom instance thumbnail set via AdminAPI produces correct URL Mark Felder 2021-04-13 10:52:53 -0500
  • 0feafcc20c Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE Mark Felder 2021-04-09 10:30:27 -0500
  • 681a42c359
    release runtime provider fix for paths Alexander Strizhakov 2021-04-08 15:45:31 +0300
  • 5ef4659b37
    test/pleroma/web/common_api_test.exs: Strip : around emoji key-name Haelwenn (lanodan) Monnier 2021-04-05 18:57:14 +0200
  • 6d6bef64bf
    fetcher_test: Remove assert on fake Create having an ap_id Haelwenn (lanodan) Monnier 2021-03-25 10:17:26 +0100
  • 53193b84b1
    utils: Fix maybe_splice_recipient when "object" isn’t a map Haelwenn (lanodan) Monnier 2020-11-27 00:25:24 +0100
  • 0b88accae6
    fetcher_test: Fix missing mock function Haelwenn (lanodan) Monnier 2020-10-21 01:20:06 +0200
  • 6c9f6e62c8
    transmogrifier: Fixing votes from Note to Answer Haelwenn (lanodan) Monnier 2020-09-28 19:34:27 +0200
  • 461123110b
    Object.Fetcher: Fix getting transmogrifier reject reason Haelwenn (lanodan) Monnier 2020-09-17 16:17:16 +0200