summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-11-25AdminAPI: Fix grouped reports for closed/resolved reportsfix/admin-api-grouped-reports-closed-reportsMaxim Filippov
2019-11-20Merge branch 'fix/sporadic-tests' into 'develop'lain
2019-11-20Merge branch 'fix-docker-build' into 'develop'lain
2019-11-20Fix sporadically failing testEgor Kislitsyn
2019-11-19Merge branch 'chore/bump-fe' into 'develop'rinpatch
2019-11-20changelog: add 1.1.6 entries from stablerinpatch
2019-11-19bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7rinpatch
2019-11-20remove docs/ from .dockerignorekPherox
2019-11-19Merge branch 'feature/admin-api/support-token-header' into 'develop'lain
2019-11-19Support authentication via `x-admin-token` HTTP headerEgor Kislitsyn
2019-11-18Merge branch 'docs/remove_activation_status_endpoint' into 'develop'feld
2019-11-18Remove deprecated endpoint from docs that is fully removed from backend nowfeld
2019-11-16Merge branch 'chore/bump-fast-sanitize' into 'develop'rinpatch
2019-11-16Bump fast_sanitizerinpatch
2019-11-15Merge branch 'chore/changelog-sync-' into 'develop'rinpatch
2019-11-16Sync the changelogs between develop and stablerinpatch
2019-11-15Merge branch 'nodeinfo-fields-limit' into 'develop'kaniini
2019-11-15Merge branch 'mix-task-warning' into 'develop'rinpatch
2019-11-15Add testkPherox
2019-11-15Merge branch 'bugfix/1395-email-activation' into 'develop'rinpatch
2019-11-15Documentation: Add warning about database mix tasks.lain
2019-11-15OAuthPlug, Router: Handle deactivated users in the UserEnabledPluglain
2019-11-15Merge branch 'feature/mrf-object-age-policy' into 'develop'lain
2019-11-15Apply suggestion to CHANGELOG.mdlain
2019-11-15Add fieldsLimit to metadata of nodeinfokPherox
2019-11-14fix credoAriadne Conill
2019-11-14object age policy: remove debug loggingAriadne Conill
2019-11-14add changelog entry for MRF ObjectAgePolicyAriadne Conill
2019-11-14MRF: add ObjectAgePolicy which deals with old posts being importedAriadne Conill
2019-11-14docs: document MRF ObjectAgePolicyAriadne Conill
2019-11-14config: add configuration for MRF ObjectAgePolicyAriadne Conill
2019-11-14Merge branch 'fix/conversations-rendering' into 'develop'rinpatch
2019-11-14format the coderinpatch
2019-11-14Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'feld
2019-11-14Merge branch 'ci/disable-trace' into 'develop'rinpatch
2019-11-14ci: disable --trace for unit testsrinpatch
2019-11-14Merge branch 'reactions' into 'develop'rinpatch
2019-11-14Update CHANGELOG.mdlain
2019-11-13Merge branch 'static-fe-object-id' into 'develop'lain
2019-11-13Support redirecting by activity UUID in static FE as well.Phil Hagelberg
2019-11-13Support redirecting by object ID in static FE.Phil Hagelberg
2019-11-13Merge branch 'fix-rate-limiter-test' into 'develop'lain
2019-11-13Merge branch 'fix-docs-formatting' into 'develop'rinpatch
2019-11-13Fix formatting in OpenBSD install manualEgor Kislitsyn
2019-11-13Fix random fails of the rate limiter testsEgor Kislitsyn
2019-11-13Merge branch 'static-remote-redirect' into 'develop'lain
2019-11-13Merge branch 'bugfix/1360-actorless-posts' into 'develop'rinpatch
2019-11-12For remote notices, redirect to the original instead of 404.Phil Hagelberg
2019-11-12Containment: Add a catch-all clause to contain_origin.lain
2019-11-11Fix rendering conversations when there's a malformed statusMark Felder