summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-11-26Merge branch 'develop' into feature/admin-api-render-whole-statusMaxim Filippov
2019-11-25Merge branch 'fix/ap-disable-remote-render' into 'develop'lain
Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010
2019-11-26AdminAPI: Grouped reports old/new fixMaxim Filippov
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
2019-11-26AdminAPI: Fix grouped reports for closed/resolved reportsMaxim Filippov
2019-11-25OStatus controller: don't serve json at /notice/, redirect insteadrinpatch
2019-11-25ActivityPub controller: do not render remote usersrinpatch
2019-11-25Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into ↵feld
'develop' Admin API: list all statuses from a given instance See merge request pleroma/pleroma!1981
2019-11-25Merge branch 'fix/update-reports-old-format' into 'develop'feld
Admin API: Fix error when trying to update reports in the "old" format See merge request pleroma/pleroma!1986
2019-11-25add ability to set a custom user-agent stringSadposter
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instanceMaxim Filippov
2019-11-25TypoMaxim Filippov
2019-11-25Admin API: Render whole status in grouped reportsMaxim Filippov
2019-11-23fetcher: move local object checking into a reusable functionrinpatch
2019-11-22Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'lain
AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994
2019-11-22Swap map with eachMaxim Filippov
2019-11-21Merge branch 'list-users' into 'develop'rinpatch
Add CLI list users command See merge request pleroma/pleroma!1990
2019-11-21Add CLI list users commandAlex Schroeder
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-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-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-19Allow mix tasks to always run with debug loggingMark Felder
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-19Support authentication via `x-admin-token` HTTP headerEgor Kislitsyn
2019-11-16Admin API: Error when trying to update reports in the "old" formatMaxim Filippov
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 'bugfix/1395-email-activation' into 'develop'rinpatch
Bugfix/1395 email activation Closes #1395 See merge request pleroma/pleroma!1965
2019-11-15OAuthPlug, Router: Handle deactivated users in the UserEnabledPluglain
2019-11-15Add fieldsLimit to metadata of nodeinfokPherox
2019-11-14object age policy: remove debug loggingAriadne Conill
2019-11-14MRF: add ObjectAgePolicy which deals with old posts being importedAriadne 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 'reactions' into 'develop'rinpatch
Emoji Reactions See merge request pleroma/pleroma!1662
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 '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-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 '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 '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