summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-02Merge branch 'tusooa/media-altdomain' into 'develop'Haelwenn
Add instructions to serve media on another domain See merge request pleroma/pleroma!3892
2023-07-02Merge branch 'testfix/system-config-use' into 'develop'Haelwenn
release_runtime_provider_test: Explicitely use non-existant config file See merge request pleroma/pleroma!3910
2023-07-02Merge branch 'tusooa/3131-handle-report-from-deactivated-user' into 'develop'Haelwenn
Fix handling report from a deactivated user Closes #3131 See merge request pleroma/pleroma!3915
2023-07-02Merge branch 'tusooa/3142-featured-collection-shouldnt-break-user-fetch' ↵Haelwenn
into 'develop' Fix user fetch completely broken if featured collection is not in a supported form See merge request pleroma/pleroma!3914
2023-07-02Merge branch 'tusooa/3151-amd64-runner' into 'develop'Haelwenn
Force the use of amd64 runners for jobs using ci-base Closes #3151 See merge request pleroma/pleroma!3913
2023-07-02Fix handling report from a deactivated usertusooa
2023-07-02Fix user fetch completely broken if featured collection is not in a ↵tusooa
supported form
2023-07-01Force the use of amd64 runners for jobs using ci-basetusooa
2023-07-01Merge branch 'bugfix/full-revert-media-host-validation' into 'develop'tusooa
Merge Revert "Merge branch 'validate-host' into 'develop'" Closes #3136 See merge request pleroma/pleroma!3909
2023-06-27Merge branch 'instance-nodeinfo-metadata' into 'develop'developHaelwenn
instances: Store some metadata based on NodeInfo See merge request pleroma/pleroma!3853
2023-06-27Merge branch 'tusooa/3119-bio-update' into 'develop'Haelwenn
Show more informative errors when profile exceeds char limits Closes #3119 See merge request pleroma/pleroma!3886
2023-06-27Merge branch 'from/upstream-develop/tusooa/backup-status' into 'develop'Haelwenn
Detail backup states Closes #3024 See merge request pleroma/pleroma!3809
2023-06-27release_runtime_provider_test: Explicitely use non-existant config fileHaelwenn (lanodan) Monnier
2023-06-22Merge branch 'weblate-extract' into 'develop'Haelwenn
Extract translatable strings See merge request pleroma/pleroma!3871
2023-06-22Merge Revert "Merge branch 'validate-host' into 'develop'"Haelwenn (lanodan) Monnier
This reverts commit d998a114e26033e98e87778e5ca659aff91831bf, reversing changes made to da6b4003acad84b0f60ad8da6d08cfe13564b058.
2023-06-22Merge branch 'fix/bypass-authorized-fetch-mode-json' into 'develop'Haelwenn
Prevent using a .json format to bypass authorized fetch mode See merge request pleroma/pleroma!3908
2023-06-22Extract translatable stringsweblate-extractor
2023-06-21Add changelog entrySean King
2023-06-21Prevent bypassing authorized fetch mode with a json fileSean King
2023-06-14Add "potentially outdated" notice in non-English versionstusooa
2023-06-13Merge branch 'no_new_privs' into 'develop'lain
Add no_new_privs to OpenRC service files See merge request pleroma/pleroma!3905
2023-06-13Add no_new_privs to OpenRC service filesHaelwenn (lanodan) Monnier
2023-06-11Merge branch 'unused_indexes' into 'develop'lain
Remove unused indexes See merge request pleroma/pleroma!3874
2023-06-11Merge branch 'fix-otp-documentation' into 'develop'lain
fix OTP install documentation See merge request pleroma/pleroma!3869
2023-06-11Merge branch 'tusooa/3054-banned-delete' into 'develop'lain
Fix deleting banned users' statuses See merge request pleroma/pleroma!3889
2023-06-11Merge branch 'pleroma-double_mentions' into 'develop'lain
ForceMentionsInContent: fix double mentions for Mastodon/Misskey posts See merge request pleroma/pleroma!3903
2023-06-11B ForceMentionsInContent: Fix test, refactor.Lain Soykaf
2023-06-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Lain Soykaf
pleroma-double_mentions
2023-06-11B Migrations: Don't remove activity_visibility_index for now.Lain Soykaf
2023-06-11Update changelogLain Soykaf
2023-06-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unused_indexesLain Soykaf
2023-06-11Merge branch 'fix/metadata-tags' into 'develop'lain
static frontend: fix meta tags See merge request pleroma/pleroma!3885
2023-06-11Merge branch 'cleanup/ostatus-user-upgrade' into 'develop'lain
Cleanup OStatus-era user upgrades and ap_enabled indicator See merge request pleroma/pleroma!3880
2023-06-11Merge branch 'revert-mediaproxy-host-validation' into 'develop'feld
Revert MediaProxy Host header validation See merge request pleroma/pleroma!3902
2023-06-11Merge branch 'fep-fffd-url' into 'develop'lain
CommonFields: Use BareUri for :url Closes #3121 See merge request pleroma/pleroma!3884
2023-06-11Merge branch 'distro-docs-elixir-1.11' into 'develop'lain
installation/debian_based_*: Elixir 1.11 means Debian 12+ and Ubuntu 22.04+ See merge request pleroma/pleroma!3898
2023-06-07changelog.dMark Felder
2023-06-07Revert MediaProxy Host header validationMark Felder
Something is going wrong here even though the tests are correct.
2023-06-06Merge branch 'preload-escaping' into 'develop'lain
B Preload: Make sure that the preloaded json is html safe See merge request pleroma/pleroma!3901
2023-06-02Add changelog.Lain Soykaf
2023-06-02B Preload: Make sure that the preloaded json is html safeLain Soykaf
2023-06-02Merge branch 'bump-gettext' into 'develop'Haelwenn
mix: bump gettext to 0.22 See merge request pleroma/pleroma!3831
2023-06-02mix: bump gettext to ~0.20Haelwenn (lanodan) Monnier
Includes https://github.com/elixir-gettext/gettext/pull/304 in 0.20.0+ Includes https://github.com/elixir-gettext/expo/issues/91 in 0.22+ via expo 0.2.0+
2023-06-01Merge branch 'test_improvement' into 'develop'Haelwenn
Use Phoenix.ConnTest.redirected_to/2 See merge request pleroma/pleroma!3899
2023-05-31Media proxy base URL doesn't need /proxySean King
2023-05-31Fix base media and proxy URL in instructions to serve media on another domainSean King
2023-05-31Use Phoenix.ConnTest.redirected_to/2Mark Felder
2023-05-31installation/debian_based_jp: Elixir 1.11 means Debian 12+ and Ubuntu 22.04+Haelwenn (lanodan) Monnier
I checked for what each part of the debian&ubuntu sentences meant with the help of Jisho.org, should be safe but it did make me notice that this guide hasn't been updated in years
2023-05-31installation/debian_based_en: Elixir 1.11 means Debian 12+ and Ubuntu 22.04+Haelwenn (lanodan) Monnier
2023-05-31Merge branch 'validate-host' into 'develop'Haelwenn
Validate Host header for MediaProxy and Uploads See merge request pleroma/pleroma!3896