aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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
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
2019-11-14Merge branch 'reactions' into 'develop'rinpatch
Emoji Reactions See merge request pleroma/pleroma!1662
2019-11-14Update CHANGELOG.mdlain
2019-11-13Merge branch 'static-fe-object-id' into 'develop'lain
Redirect object/activity ID to notice in static-fe Closes #1412 See merge request pleroma/pleroma!1977
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
This matches the behavior of pleroma-fe better. Fixes #1412.
2019-11-13Merge branch 'fix-rate-limiter-test' into 'develop'lain
Fix random fails of the rate limiter tests (hopefully) See merge request pleroma/pleroma!1978
2019-11-13Merge branch 'fix-docs-formatting' into 'develop'rinpatch
Fix formatting in OpenBSD install manual See merge request pleroma/pleroma!1979
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
For remote notices, redirect to the original instead of 404 in static-fe See merge request pleroma/pleroma!1974
2019-11-13Merge branch 'bugfix/1360-actorless-posts' into 'develop'rinpatch
Containment: Add a catch-all clause to contain_origin. Closes #1360 See merge request pleroma/pleroma!1975
2019-11-12For remote notices, redirect to the original instead of 404.Phil Hagelberg
We shouldn't treat these like local statuses, but I don't think a 404 is the right choice either here, because within pleroma-fe, these are valid URLs. So with remote notices you have the awkward situation where clicking a link will behave differently depending on whether you open it in a new tab or not; the new tab will 404 if it hits static-fe. This new redirecting behavior should improve that situation.
2019-11-12Containment: Add a catch-all clause to contain_origin.lain
2019-11-11Fix rendering conversations when there's a malformed statusMark Felder
2019-11-11Merge branch 'fix/docs-static-fe-category' into 'develop'rinpatch
docs: move static-fe docs under a proper category See merge request pleroma/pleroma!1972
2019-11-11docs: move static-fe docs under a proper categoryrinpatch
2019-11-11Merge branch 'nodeinfo-federation-enabled' into 'develop'feld
report federating status in nodeinfo See merge request pleroma/pleroma!1971
2019-11-11Merge branch 'feature/static-fe' into 'develop'kaniini
Static frontend See merge request pleroma/pleroma!1917
2019-11-11report federating status in nodeinfohref
2019-11-11Merge branch 'fix-dokku-2' into 'develop'lain
Dokku deploys: Keep the git dir so version number generation works. See merge request pleroma/pleroma!1967
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 00:43:39 +0000