aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-20[#1335] Added CHANGELOG.md entry.Ivan Tashkinov
2019-11-20Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-20Merge branch 'fix/sporadic-tests' into 'develop'lain
Fix sporadically failing test Closes #1432 See merge request pleroma/pleroma!1999
2019-11-20[#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵Ivan Tashkinov
UserRelationship-related functionality.
2019-11-20Merge branch 'fix-docker-build' into 'develop'lain
Fix failing docker build See merge request pleroma/pleroma!1998
2019-11-20[#1335] User AP ID relations fetching performance optimizations.Ivan Tashkinov
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-19Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-19[#1335] Implemented notification mutes and reblog mutes as ↵Ivan Tashkinov
UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19benchmarks/ added favourites timelineMaksim Pechnikov
2019-11-20remove docs/ from .dockerignorekPherox
2019-11-19Fix testsMaxim Filippov
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-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-19Support authentication via `x-admin-token` HTTP headerEgor Kislitsyn
2019-11-18Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-18[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced ↵Ivan Tashkinov
EctoEnum.
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-16Admin API: Error when trying to update reports in the "old" formatMaxim Filippov
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-15Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-15[#1335] Reorganized `users.mutes` as relation to UserMute entity.Ivan Tashkinov
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 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-14Admin API: list all statuses from a given instanceMaxim Filippov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 02:07:06 +0000