summaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Collapse)Author
2019-12-04updated ScheduledActivityMaksim Pechnikov
2019-11-28Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-11-28Merge branch 'cleanup-tests-output' into 'develop'lain
Cleanup tests output See merge request pleroma/pleroma!2018
2019-11-28Cleanup tests outputEgor Kislitsyn
2019-11-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
bugfix/1442-dont-return-nil-for-following-count
2019-11-27Remove User.user_info/2Egor Kislitsyn
2019-11-26moved Pleroma.Stats to Oban Periodic jobsMaksim Pechnikov
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-25OStatus controller: don't serve json at /notice/, redirect insteadrinpatch
2019-11-25ActivityPub controller: do not render remote usersrinpatch
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-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-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-20Fix sporadically failing testEgor Kislitsyn
2019-11-19Fix testsMaxim Filippov
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim 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-15Add testkPherox
2019-11-14fix credoAriadne 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 '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-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-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 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-10fix for migrate taskAlexander
2019-11-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-11-10add subject to atom feedMaksim Pechnikov
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-08Merge remote-tracking branch 'origin/develop' into reactionslain
2019-11-08Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-08Support old flag formatMaxim Filippov
2019-11-07Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`eugenijm
2019-11-06Grouped reports with status data baked inMaxim Filippov
2019-11-05Check client and token in GET /oauth/authorizeAkiraFukushima
2019-11-05Merge branch 'develop' into feature/multiple-users-force-password-resetMaxim Filippov
2019-11-05Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-11-04excluded invisible actors from gets /api/v1/accounts/:idMaksim Pechnikov
2019-11-04Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the ↵eugenijm
`conversation` stream event payload.
2019-11-04Merge branch 'transmogrifier-test-errors' into 'develop'lain
capture test log where errors are expected See merge request pleroma/pleroma!1915