aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-08-17Merge branch 'invisible-index' into 'develop'rinpatch
2020-08-17Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privac...lain
2020-08-17Migrations: Add an index on the `invisible` field on users.lain
2020-08-17Merge branch 'fix/start-ssl-if-ssl-required' into 'develop'rinpatch
2020-08-17Apply 1 suggestion(s) to 1 file(s)Hugo
2020-08-17Start :ssl if not started when running migration or rollbackHugo Müller-Downing
2020-08-15[#2046] Added test for pleroma/restrict_unauthenticated defaults on private i...Ivan Tashkinov
2020-08-15Merge branch 'fix/docs-tabs' into 'develop'rinpatch
2020-08-15Docs: Fix the way tabs are declaredrinpatch
2020-08-14Merge branch 'update/admin-fe-20200814' into 'develop'feld
2020-08-14[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy...Ivan Tashkinov
2020-08-14Update AdminFE bundle for 2.1.0 releaseMark Felder
2020-08-14Merge branch '1806-mogrifun' into 'develop'lain
2020-08-14Mogrifun: Add a line about the purpose of the module.lain
2020-08-13Merge branch 'issue/2036-part-2' into 'develop'feld
2020-08-13fix cron wrokerMaksim Pechnikov
2020-08-13fix Cron.PurgeExpiredActivitiesWorkerMaksim Pechnikov
2020-08-13Merge branch 'fix/activity-expirations-again' into 'develop'feld
2020-08-13Merge branch 'nitfix/side-effects-typo' into 'develop'Haelwenn
2020-08-13side_effects: Fix typo on notificationHaelwenn (lanodan) Monnier
2020-08-13Merge branch 'reject' into 'develop'Haelwenn
2020-08-13Merge branch 'ci-fix-2' into 'develop'lain
2020-08-13CI: Add cmake to buildlain
2020-08-13Merge branch 'update-frontend-2020-08-13' into 'develop'lain
2020-08-13Update frontendlain
2020-08-13Merge branch 'cmake' into 'develop'lain
2020-08-13Build files: Add cmakelain
2020-08-13Merge branch 'fix/users_ap_id_not_null' into 'develop'lain
2020-08-13Migrations: Fix Logger requirements.lain
2020-08-13Merge branch '1152-deletion' into 'develop'lain
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
2020-08-12Update robots_txt.mdfeld
2020-08-12Merge branch 'feature/update-welcome-setting-in-description' into 'develop'feld
2020-08-12Add warning to the migrationMark Felder
2020-08-12Add the ActivityExpirationPolicy MRF to docs and clarify post expiration crit...Mark Felder
2020-08-12Merge branch 'develop' into fix/activity-expirations-againMark Felder
2020-08-12AdminApiControllerTest: Add test that `deleted` users get deactivated.lain
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-12Merge branch 'issue/2036-job-monitor' into 'develop'rinpatch
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 fix/activit...lain