aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
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-25moved OAuth.Token.CleanWorker to Oban Periodic jobsMaksim Pechnikov
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-23Removed users.info and remaining usages.Ivan Tashkinov
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 '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 remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs
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-20[#1335] Reorganized users.subscribers as UserRelationship. Added tests for ↵Ivan Tashkinov
UserRelationship-related functionality.
2019-11-20[#1335] User AP ID relations fetching performance optimizations.Ivan Tashkinov
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 order favorites activitesMaksim Pechnikov
2019-11-19AdminAPI: Confirm user account, resend confirmation emailMaxim Filippov
2019-11-19Support authentication via `x-admin-token` HTTP headerEgor Kislitsyn
2019-11-18fix `order by` for fetch_favoritesMaksim Pechnikov
2019-11-18Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations
2019-11-18[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced ↵Ivan Tashkinov
EctoEnum.
2019-11-18updated fetch_favoritesMaksim Pechnikov
2019-11-18fix testMaksim Pechnikov
2019-11-18 /api/v1/favourites: added sorting for activites by adds to favoritesMaksim Pechnikov
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 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-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 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