summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-15Documentation: Add warning about database mix tasks.lain
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
2019-11-11Merge branch 'patch-1' into 'develop'rinpatch
Default config: Use extended nickname format See merge request pleroma/pleroma!1968
2019-11-11Merge branch 'chore/changelog-1940' into 'develop'rinpatch
Add a changelog entry for !1940 See merge request pleroma/pleroma!1970
2019-11-11Add a changelog entry for !1940rinpatch
2019-11-11Merge branch 'update-ci' into 'develop'lain
Use PG12 in CI for the RUM pipeline Closes #1377 See merge request pleroma/pleroma!1969
2019-11-11Default config: Use extended nickname formatlain
2019-11-11Use PG12 in CI for the RUM pipelineEgor Kislitsyn
2019-11-11Dokku deploys: Keep the git dir so version number generation works.lain
2019-11-11Merge branch 'update-docs' into 'develop'lain
Add a warning about Pg version to the RUM related docs See merge request pleroma/pleroma!1966
2019-11-11Merge branch 'iss-1376' into 'develop'lain
Check client and token in GET /oauth/authorize See merge request pleroma/pleroma!1940
2019-11-11Merge branch 'fix/1399' into 'develop'lain
fix for migrate config to db task Closes #1399 See merge request pleroma/pleroma!1964
2019-11-11Add a warning about Pg version to the RUM related docsEgor Kislitsyn
2019-11-11Merge branch 'new-rate-limiter' into 'develop'lain
New rate limiter See merge request pleroma/pleroma!1946
2019-11-11New rate limiterSteven Fuchs
2019-11-11Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-11Add "/api/pleroma/admin/reports/:id" -> "/api/pleroma/admin/reports" ↵Maxim Filippov
changelog entry
2019-11-11Code style fixesMaxim Filippov
2019-11-11Apply suggestion to CHANGELOG.mdMaxim Filippov
2019-11-10fix for migrate taskAlexander
2019-11-10Merge branch 'disable-attachment-links' into 'develop'lain
Disable attachment links by default Closes #1394 See merge request pleroma/pleroma!1962
2019-11-10Disable attachment links by defaultrinpatch
Closes #1394
2019-11-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-11-10Merge branch 'issue/1339' into 'develop'lain
[#1339] add subject to atom feed See merge request pleroma/pleroma!1961
2019-11-10Apply suggestion to config/config.exslain
2019-11-10Apply suggestion to config/config.exslain
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 06:00:24 +0000