aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-11UserEnabledPlug: Don't authenticate unconfirmed users.lain
2019-11-11User: Don't let deactivated users authenticate.lain
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
2019-11-10Merge branch 'refactor/readme' into 'develop'lain
Partial readme rewrite See merge request pleroma/pleroma!1958
2019-11-10add subject to atom feedMaksim Pechnikov
2019-11-09Formatter moved to new module.Phil Hagelberg
2019-11-09Add changelog entry, cheatsheet docs, and alphabetize.Phil Hagelberg
2019-11-09Add some further test cases.Phil Hagelberg
Including like ... private visibility, cos that's super important.
2019-11-09Add tests for static_fe controller.Phil Hagelberg
2019-11-09Prevent non-local notices from rendering.Phil Hagelberg
2019-11-09Move static_fe config to its own section instead of in :instance.Phil Hagelberg
2019-11-09Render errors in HTML, not with JS.Phil Hagelberg
2019-11-09Expand subject content automatically when config is set.Phil Hagelberg
2019-11-09Include metadata in static FE conversations and profiles.Phil Hagelberg
2019-11-09Catch 404s.Phil Hagelberg
2019-11-09Pagination for user profiles.Phil Hagelberg
2019-11-09Make many of the improvements suggested in review.Phil Hagelberg
2019-11-09Static FE plug should only respond to text/html requests.Phil Hagelberg
2019-11-09Move static FE routing into its own plug.Phil Hagelberg
Previously it was piggybacking on FallbackRedirectController for users and OStatusController for notices; now it's all in one place.
2019-11-09Make sure notice link is remote if the post is remote.Phil Hagelberg
2019-11-09Visually separate header.Phil Hagelberg