summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-21Merge branch 'revert-5c6c3026' into 'develop'rinpatch
Revert "Merge branch 'patch-1' into 'develop'" See merge request pleroma/pleroma!2002
2019-11-21Merge branch 'fix/mix-task-logging' into 'develop'lain
Allow mix tasks to always run with debug logging See merge request pleroma/pleroma!1997
2019-11-21Revert "Merge branch 'patch-1' into 'develop'"rinpatch
This reverts merge request !1829
2019-11-21Merge branch 'issue/1348' into 'develop'lain
[#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937
2019-11-21Object: Use inspect to log missing preload.lain
2019-11-21Merge branch 'fix/user-following-count' into 'develop'lain
Fix user.following_count See merge request pleroma/pleroma!2000
2019-11-21Merge branch 'remove-useless-warning' into 'develop'lain
Remove version mismatch warning See merge request pleroma/pleroma!2001
2019-11-21Remove version mismatch warningEgor Kislitsyn
2019-11-21Fix user.following_countEgor Kislitsyn
2019-11-20Some tasks try to set log level in test environment, but we were stripping ↵Mark Felder
logs belog :warn. Ensure console backend logs in test environment are :warn, but mix tasks run in test env do not run with :debug because it's far too verbose.
2019-11-20Console backend's log format should be prefixed and suffixed with newlines.Mark Felder
This is how upstream does it by default.
2019-11-20Merge branch 'develop' into fix/mix-task-loggingMark Felder
2019-11-20Be specific about format for logs in test as we have tests that check itMark Felder
2019-11-20Merge branch 'fix/sporadic-tests' into 'develop'lain
Fix sporadically failing test Closes #1432 See merge request pleroma/pleroma!1999
2019-11-20Merge branch 'fix-docker-build' into 'develop'lain
Fix failing docker build See merge request pleroma/pleroma!1998
2019-11-20Fix sporadically failing testEgor Kislitsyn
2019-11-19Allow test builds to have info and debug logs strippedMark Felder
2019-11-19Allow mix tasks to always run with debug loggingMark Felder
2019-11-19Merge branch 'chore/bump-fe' into 'develop'rinpatch
Bump fe and sync changelogs See merge request pleroma/pleroma!1996
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
Admin API: Support authentication via `x-admin-token` HTTP header Closes #1430 See merge request pleroma/pleroma!1993
2019-11-19Support authentication via `x-admin-token` HTTP headerEgor Kislitsyn
2019-11-18Merge branch 'docs/remove_activation_status_endpoint' into 'develop'feld
Remove deprecated endpoint from docs that is fully removed from backend now See merge request pleroma/pleroma!1992
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
Bump fast_sanitize See merge request pleroma/pleroma!1988
2019-11-16Bump fast_sanitizerinpatch
2019-11-15Merge branch 'chore/changelog-sync-' into 'develop'rinpatch
Sync the changelogs between develop and stable See merge request pleroma/pleroma!1985
2019-11-16Sync the changelogs between develop and stablerinpatch
2019-11-15Merge branch 'nodeinfo-fields-limit' into 'develop'kaniini
Add fieldsLimit to metadata of nodeinfo See merge request pleroma/pleroma!1983
2019-11-15Merge branch 'mix-task-warning' into 'develop'rinpatch
Documentation: Add warning about database mix tasks. See merge request pleroma/pleroma!1984
2019-11-15Add testkPherox
2019-11-15Merge branch 'bugfix/1395-email-activation' into 'develop'rinpatch
Bugfix/1395 email activation Closes #1395 See merge request pleroma/pleroma!1965
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
MRF: add ObjectAgePolicy See merge request pleroma/pleroma!1982
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
Fix rendering conversations when there's a malformed status Closes #1401 See merge request pleroma/pleroma!1973
2019-11-14format the coderinpatch
2019-11-14Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'feld
Admin API: Grouped reports, update multiple reports in one query Closes admin-fe#43 See merge request pleroma/pleroma!1815
2019-11-14Merge branch 'ci/disable-trace' into 'develop'rinpatch
ci: disable --trace for unit tests See merge request pleroma/pleroma!1980
2019-11-14ci: disable --trace for unit testsrinpatch
it is mostly useless, but makes failures harder to find
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 18:44:59 +0000