summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-11.arm64testlain
2020-09-09Merge branch 'weblate-pleroma-pleroma' into 'develop'lain
Translations update from Weblate See merge request pleroma/pleroma!2977
2020-09-09Translated using Weblate (Spanish)tarteka
Currently translated at 9.4% (10 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/es/
2020-09-09Added translation using Weblate (Spanish)tarteka
2020-09-08Merge branch 'stable-sync/2.1.1' into 'develop'rinpatch
Sync stable with develop after 2.1.1 Closes #2, #2047, #2095, #2116, #1987, and #2080 See merge request pleroma/pleroma!2974
2020-09-08Merge branch 'stable' into stable-sync/2.1.1rinpatch
2020-09-08Metadata: Move restriction check from Feed provider to activated_providersrinpatch
2020-09-08Use :restrict_unauthenticated testing for more granular controlMark Felder
2020-09-08Document breaking change for metadata providersMark Felder
2020-09-08RelMe and Feed no longer configurableMark Felder
2020-09-08Do not serve RSS/Atom feeds when instance is privateMark Felder
2020-09-08Fix test so setting doesn't leakMark Felder
2020-09-08Feed provider only generates a redirect, so always activate it.Mark Felder
Making this configurable is misleading.
2020-09-08Disable providers of user and status metadata when instance is privateMark Felder
2020-09-08Do not make RelMe metadata provider optional.Mark Felder
There's really no sound reason to turn this off anyway.
2020-09-08user: harden get_friends_query(), get_followers_query() and their wrappersHaelwenn (lanodan) Monnier
2020-09-08search: Apply following filter only when user is usableHaelwenn (lanodan) Monnier
2020-09-08AP C2S: Restrict character limit on NoteHaelwenn (lanodan) Monnier
2020-09-08Fix atom leak in AdminAPIControllerEgor Kislitsyn
2020-09-08Merge branch 'release/2.1.1' into 'stable'v2.1.1rinpatch
2.1.1 release See merge request pleroma/secteam/pleroma!13
2020-09-08SECURITY.md: we don't support 2.0 anymore, bump to 2.1rinpatch
2020-09-08Merge branch 'bugfix/mock' into 'develop'Haelwenn
mockfix but for non-secteam because gitlab See merge request pleroma/pleroma!2973
2020-09-08pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679rinpatch
2020-09-08Merge branch 'temp-hackney-fix' into 'develop'rinpatch
temp hackney fix See merge request pleroma/pleroma!2951
2020-09-08Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'rinpatch
Skip processing webp image files because we can't strip EXIF Closes #2080 See merge request pleroma/pleroma!2924
2020-09-08CHANGELOG.md: Add 2.1.1 entryrinpatch
2020-09-08Merge branch 'bugfix/mock' into 'develop'Haelwenn
mockfix but for non-secteam because gitlab See merge request pleroma/pleroma!2973
2020-09-08combo fixesAlexander Strizhakov
2020-09-08don't run async tests, which use MockAlexander Strizhakov
2020-09-08Merge branch 'develop' into 'develop'feld
ForceBotUnlistedPolicy See merge request pleroma/pleroma!2967
2020-09-08Merge branch 'bugfix/favicon-empty-test' into 'develop'Haelwenn
Bugfix/favicon empty test See merge request pleroma/pleroma!2972
2020-09-08account_view_test: Remove empty testHaelwenn (lanodan) Monnier
2020-09-08test: remove extraneous :instances_favicons config bitsHaelwenn (lanodan) Monnier
2020-09-08Revert "description.exs: add ForceBotUnlistedPolicy"Mark Felder
This reverts commit 7215563641e2a5096293128519d6a454aabc46f2.
2020-09-08Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlistedMark Felder
2020-09-08Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'rinpatch
Skip processing webp image files because we can't strip EXIF Closes #2080 See merge request pleroma/pleroma!2924
2020-09-08mix.exs: bump version to 2.1.1rinpatch
2020-09-08Disable favicon scraping in testsrinpatch
2020-09-08changelog: add ForceBotUnlistedPolicyAlibek Omarov
2020-09-08docs: cheatsheet: add ForceBotUnlistedPolicyAlibek Omarov
2020-09-08description.exs: add ForceBotUnlistedPolicyAlibek Omarov
2020-09-08Merge branch 'fix/2108-adapter-options' into 'develop'rinpatch
Adapter options unification Closes #2108 See merge request pleroma/pleroma!2952
2020-09-08Merge branch 'fix/admin-controller-atom-leak' into 'develop'rinpatch
Fix atom leak in AdminAPIController See merge request pleroma/secteam/pleroma!6
2020-09-08Merge branch 'fix/rich-media-fake-statuses' into 'develop'lain
Rich Media: Do not cache URLs for preview statuses Closes #1987 See merge request pleroma/pleroma!2956
2020-09-08Merge branch 'develop' into 'develop'lain
Added cmake See merge request pleroma/pleroma!2953
2020-09-08Merge branch 'chore/fast_html-bump' into 'develop'rinpatch
mix.lock: Bump fast_html See merge request pleroma/pleroma!2950
2020-09-08Merge branch 'bugfix/favicon-too-long' into 'develop'rinpatch
instance: Drop favicon URLs longer than 255 characters Closes #2116 See merge request pleroma/pleroma!2949
2020-09-08Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
Disallow password resets for deactivated accounts Closes #2095 See merge request pleroma/pleroma!2935
2020-09-08Merge branch 'chore/fast-sanitize-bump' into 'develop'rinpatch
mix.lock: bump fast_sanitize See merge request pleroma/pleroma!2932
2020-09-08Merge branch 'http-fixes' into 'develop'rinpatch
Improvements and fixes for http requests See merge request pleroma/pleroma!2904