summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 15:17:50 +0000