aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-13Minor reorganizationFarhan Khan
2020-08-13Adding installation documentation for FreeBSD + rc.d scriptFarhan Khan
2020-08-13Merge branch 'issue/2036-part-2' into 'develop'feld
[#2036] fixed cron worker See merge request pleroma/pleroma!2886
2020-08-13fix cron wrokerMaksim Pechnikov
2020-08-13fix Cron.PurgeExpiredActivitiesWorkerMaksim Pechnikov
2020-08-13Merge branch 'fix/activity-expirations-again' into 'develop'feld
Fix activity expirations again See merge request pleroma/pleroma!2866
2020-08-13Merge branch 'nitfix/side-effects-typo' into 'develop'Haelwenn
side_effects: Fix typo on notification See merge request pleroma/pleroma!2885
2020-08-13side_effects: Fix typo on notificationHaelwenn (lanodan) Monnier
2020-08-13Merge branch 'reject' into 'develop'Haelwenn
Move Accepts and Rejects to the Pipeline See merge request pleroma/pleroma!2878
2020-08-13Merge branch 'ci-fix-2' into 'develop'lain
CI: Add cmake to build See merge request pleroma/pleroma!2884
2020-08-13CI: Add cmake to buildlain
2020-08-13Merge branch 'update-frontend-2020-08-13' into 'develop'lain
Update frontend See merge request pleroma/pleroma!2883
2020-08-13Update frontendlain
2020-08-13Merge branch 'cmake' into 'develop'lain
Build files: Add cmake See merge request pleroma/pleroma!2882
2020-08-13Build files: Add cmakelain
2020-08-13Merge branch 'fix/users_ap_id_not_null' into 'develop'lain
Ensure ap_id column in users table cannot be null See merge request pleroma/pleroma!2875
2020-08-13Migrations: Fix Logger requirements.lain
2020-08-13Merge branch '1152-deletion' into 'develop'lain
User deletion issue exploration See merge request pleroma/pleroma!2879
2020-08-13Merge branch 'develop' into issue/1936Maksim Pechnikov
2020-08-12reverting pinned posts in filteringAlexander Strizhakov
2020-08-12don't load pinned activities in due_expirationsAlexander Strizhakov
2020-08-12Merge branch 'docs_improve_static_dir_documentation' into 'develop'feld
Improve static_dir documentation See merge request pleroma/pleroma!2864
2020-08-12Update robots_txt.mdfeld
2020-08-12Merge branch 'feature/update-welcome-setting-in-description' into 'develop'feld
Update :welcome settings in description.exs Closes #2024 See merge request pleroma/pleroma!2843
2020-08-12Add warning to the migrationMark Felder
2020-08-12Add the ActivityExpirationPolicy MRF to docs and clarify post expiration ↵Mark Felder
criteria.
2020-08-12Merge branch 'develop' into fix/activity-expirations-againMark Felder
2020-08-12AdminApiControllerTest: Add test that `deleted` users get deactivated.lain
2020-08-12Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy
2020-08-12ActivityPub: Remove `reject`, move everything to the Pipeline.lain
2020-08-12Transmogrifier: Move Rejects to the Pipelinelain
2020-08-12don't expire pinned postsAlexander Strizhakov
2020-08-12Transmogrifier Tests: Extract rejections.lain
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