summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-12Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rejectlain
2020-08-12leave expirations with Create and Note typesAlexander Strizhakov
2020-08-12update docsMaksim Pechnikov
2020-08-12Merge branch 'issue/2036-job-monitor' into 'develop'rinpatch
[#2036] fix job monitor See merge request pleroma/pleroma!2877
2020-08-11fix job monitorMaksim Pechnikov
2020-08-11Linting fixes.lain
2020-08-11Ensure only Note objects are set to expireMark Felder
2020-08-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
fix/activity-expirations-again
2020-08-11ActivityPub: Remove ActivityPub.acceptlain
Switch to the pipeline in CommonAPI and SideEffects
2020-08-11Ensure ap_id column in users table cannot be nullMark Felder
2020-08-11Transmogrifier: Handle accepts with the pipelinelain
2020-08-11Transmogrifier Test: Remove mastodon hack test.lain
2020-08-11Linter fixes.lain
2020-08-11Merge branch 'set-approval-pending-default-to-false' into 'develop'lain
Set `users.approval_pending` default to `false` See merge request pleroma/pleroma!2874
2020-08-11Transmogrifier: Remove handling of orphaned acceptslain
This was a Mastodon 2.3 issue and has been fixed for a long time. According to fediverse.networks, less than one percent of servers still run a version this old or older.
2020-08-11AcceptValidation: Codify accept rules.lain
2020-08-11Set `users.approval_pending` default to `false`Egor Kislitsyn
2020-08-11AcceptValidator: Add basic validator with tests.lain
2020-08-11Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # mix.lock
2020-08-11Transmogrifier: Small readability changes.lain
2020-08-11Transmogrifier Tests: Extract Accept handlinglain
2020-08-11Merge branch '204-fix' into 'develop'lain
Fix 500 errors when returning :no_content, fixes #2029 Closes #2029 See merge request pleroma/pleroma!2856
2020-08-11Apply 1 suggestion(s) to 1 file(s)lain
2020-08-11Merge branch 'fix/activity-expirations-again' of ↵lain
git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11SideEffects: Handle strange deletion case.lain
2020-08-11added paginate+search for admin/MediaProxy URLsMaksim Pechnikov
2020-08-10Merge branch 'admin-active-filter' into 'develop'feld
Admin API: Filter out unapproved users when the `active` filter is on Closes #2037 See merge request pleroma/pleroma!2872
2020-08-10Merge branch 'develop' into fix/activity-expirations-againMark Felder
2020-08-10Admin API: Filter out unapproved users when the `active` filter is onEgor Kislitsyn
2020-08-10Merge branch 'revert-a6d3bb5f' into 'develop'lain
Revert "Merge branch 'issue/1023' into 'develop'" Closes #2033 See merge request pleroma/pleroma!2868
2020-08-10Merge branch 'remove-unreachable-code' into 'develop'lain
Transmogrifier: Remove duplicate code. See merge request pleroma/pleroma!2871
2020-08-10Merge branch 'develop' into 'develop'lain
docs: add cmake to other installation guides Closes #2039 See merge request pleroma/pleroma!2870
2020-08-10Merge branch '2039-cmake' into 'develop'lain
Docs: Add cmake dependency Closes #2039 See merge request pleroma/pleroma!2869
2020-08-10Transmogrifier: Remove duplicate code.lain
2020-08-10docs: add cmake to other installation guidesAlibek Omarov
2020-08-10Docs: Add cmake dependencylain
2020-08-10Revert "Merge branch 'issue/1023' into 'develop'"lain
This reverts merge request !2763
2020-08-10Apply 1 suggestion(s) to 1 file(s)Ilja
2020-08-10Apply 1 suggestion(s) to 1 file(s)Ilja
2020-08-10Merge branch 'fix/flaky-migration-episode-666' into 'develop'rinpatch
20200802170532_fix_legacy_tags: Select only fields the migration needs See merge request pleroma/pleroma!2863
2020-08-10Merge branch '2038-old-update-info' into 'develop'rinpatch
AccountController: Build the correct update activity. Closes #2038 See merge request pleroma/pleroma!2867
2020-08-1020200802170532_fix_legacy_tags: chunk the user queryrinpatch
2020-08-1020200802170532_fix_legacy_tags: Select only fields the migration needsrinpatch
Selecting the full struct will break as soon as a new field is added.
2020-08-10AccountController: Build the correct update activity.lain
Will fix federation issues.
2020-08-09Merge branch 'feat/floki-fast-html-2' into 'develop'lain
Update to fast_html 2 and use it for Floki parsing See merge request pleroma/pleroma!2861
2020-08-09Merge branch 'security-policy' into 'develop'lain
Add security policy for Pleroma backend Closes #1848 See merge request pleroma/pleroma!2862
2020-08-09Merge branch 'develop' into 'feat/floki-fast-html-2'lain
# Conflicts: # config/config.exs
2020-08-08Limit expirations for each cron execution to 50.Mark Felder
This should prevent servers from being crushed. 50/min is a pretty good rate.
2020-08-08Don't filter on localMark Felder
2020-08-08Ensure we only expire Create activities with the Mix taskMark Felder