aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2019-11-20Fix sporadically failing testEgor Kislitsyn
2019-11-19Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-19[#1335] Implemented notification mutes and reblog mutes as ↵Ivan Tashkinov
UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19Fix testsMaxim Filippov
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-19Support authentication via `x-admin-token` HTTP headerEgor Kislitsyn
2019-11-18Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
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 remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-15[#1335] Reorganized `users.mutes` as relation to UserMute entity.Ivan Tashkinov
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-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 remote-tracking branch 'upstream/develop' into feature/move-activityEgor Kislitsyn
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 'fix-rate-limiter-test' into 'develop'lain
Fix random fails of the rate limiter tests (hopefully) See merge request pleroma/pleroma!1978
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-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-12Add a notification for Move activitiesEgor Kislitsyn
2019-11-12Add `allow_following_move` setting to UserEgor Kislitsyn
2019-11-12Containment: Add a catch-all clause to contain_origin.lain
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
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-10fix for migrate taskAlexander
2019-11-10[#1335] User: refactored :blocks field into :blocked_users relation.Ivan Tashkinov
Introduced UserBlock.
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-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-08object containment: handle all cases where ID is invalid (missing, nil, ↵Ariadne Conill
non-string)
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