summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-12-23FormattingMark Felder
2020-12-23Update descriptions for MediaProxy, remove settings that should not be ↵Mark Felder
exposed in AdminFE
2020-12-23Remove Proxy settings that were not meant to exist under Pleroma.UploadMark Felder
2020-12-23Merge branch 'update/linkify' into 'develop'lain
Update Linkify to 0.4.1 See merge request pleroma/pleroma!3217
2020-12-23Update Linkify to 0.4.1Mark Felder
Fixes false positive detection of IPv4 addresses
2020-12-23Merge branch 'mergeback/2.2.1' into 'develop'lain
Mergeback/2.2.1 See merge request pleroma/pleroma!3215
2020-12-23Align changeloglain
2020-12-23Merge branch 'stable' into mergeback/2.2.1lain
2020-12-23Merge branch 'release/2.2.1' into 'stable'lain
Release/2.2.1 See merge request pleroma/pleroma!3214
2020-12-23Fixtures: Add application actor fixture.lain
2020-12-23Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into ↵lain
release/2.2.1
2020-12-23Update changeloglain
2020-12-23Apply 1 suggestion(s) to 1 file(s)lain
2020-12-23Lintinglain
2020-12-23Update frontendlain
2020-12-22Mix: Update version.lain
2020-12-22Update changeloglain
2020-12-22Report fixes.lain
2020-12-22Mix: Update linkify to 0.4.1lain
2020-12-22[#2301] Quick fix: users with is_discoverable == false (default!) are ↵Ivan Tashkinov
included in search results.
2020-12-22fix for elixir 1.11Alexander Strizhakov
load runtime configs in releases with config provider
2020-12-22SideEffects: fix testlain
2020-12-22User: Remove left-over (wrong) fix.lain
2020-12-22User: Don't allow local users in remote changesetslain
2020-12-22Switch to a fork of Hackney 1.15.2 for now so we can have our URL ↵Mark Felder
normalization bugfix
2020-12-22Update changeloglain
2020-12-22Search: Only skip ordering the rum index.lain
2020-12-22Activity search: Fix order of resultslain
Greatly speeds up the search for RUM.
2020-12-22Document fixing the pleroma.user delete_activities mix taskMark Felder
2020-12-22Need to start web_resp cache or mix task failsMark Felder
2020-12-22Document S3 and Elixir 1.11 compat fixMark Felder
2020-12-22Fix S3 uploads with Elixir 1.11Mark Felder
2020-12-22pleroma.instance: Fix Exiftool module nameHaelwenn (lanodan) Monnier
2020-12-22remove PurgeExpiredActivity from Oban db configAlexander Strizhakov
2020-12-22Merge branch 'update-elixir-make' into 'develop'feld
Update for retired elixir_make package version See merge request pleroma/pleroma!3211
2020-12-22update for retired elixir_make package versionAlexander Strizhakov
2020-12-22Merge branch 'update/instance-gen-template' into 'develop'rinpatch
Update instance.gen template See merge request pleroma/pleroma!3210
2020-12-21Do not include pool_size in the template. It encourages unwanted fiddling :)Mark Felder
2020-12-21Merge branch 'develop' into 'develop'lain
WebFinger: add subscribe_address in return data of JSON responses See merge request pleroma/pleroma!3206
2020-12-21Fix trailing whitespaces in lib/pleroma/web/web_finger.exKaizhe Huang
2020-12-20Merge branch 'fix/remove-sharelock-warning-oban-configdb' into 'develop'lain
config/description.exs: Remove outdated information about Oban See merge request pleroma/pleroma!3208
2020-12-20Merge branch 'bugfix/mastofe-install-script' into 'develop'rinpatch
download-mastofe-build.sh: Proper exit when artifact is missing Closes #2329 See merge request pleroma/pleroma!3191
2020-12-19Add test for subscribe_address in JSON WebFinger responseKaizhe Huang
2020-12-19config/description.exs: Remove outdated information about Obanrinpatch
The version of Oban we depend on no longer uses ShareLocks, so this note no longer applies.
2020-12-18WebFinger: add subscribe_address in return data of JSON responsesFiveYellowMice
2020-12-17Merge branch 'long-life-oauth-tokens' into 'develop'rinpatch
[#2353] Virtually never-expiring OAuth tokens (new and already issued ones) Closes #2353 See merge request pleroma/pleroma!3205
2020-12-17[#2353] Virtually never-expiring OAuth tokens (new and already issued ones).Ivan Tashkinov
2020-12-17Merge branch 'registration-workflow' into 'develop'feld
Improve registration workflow, fixes #2175 Closes #2235 and #2175 See merge request pleroma/pleroma!3068
2020-12-17Merge remote-tracking branch 'upstream/develop' into registration-workflowAlex Gleason
2020-12-16Merge branch 'fix/2336-mastoapi-ws-posts-dropping' into 'develop'lain
Fix mastoapi ws posts dropping Closes #2336 See merge request pleroma/pleroma!3198