aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers
AgeCommit message (Collapse)Author
2020-06-08Merge branch 'features/apc2s-pagination' into 'develop'Haelwenn
Fix AP C2S pagination Closes #866 and #751 See merge request pleroma/pleroma!2491
2020-05-01Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'rinpatch
Enforcement of OAuth scopes check for authenticated API endpoints See merge request pleroma/pleroma!2349
2020-03-31Merge branch 'admin-api-change-password' into 'develop'lain
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149
2020-03-31Merge branch '1364-notifications-sending-control' into 'develop'rinpatch
[#1364] Ability to opt-out of notifications (in all clients) Closes #1364 See merge request pleroma/pleroma!2301
2020-03-15auth_controller.ex: Add admin scope to MastoFEHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
2020-03-15Merge branch 'fix/signup-without-email' into 'develop'feld
Allow account registration without an email See merge request pleroma/pleroma!2246
2020-03-04MastodonController: Return 404 errors correctly.lain
2020-03-03Update CopyrightsMark Felder
2020-03-02Bump copyright years of files changed after 2020-01-07Haelwenn (lanodan) Monnier
Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-03-01timeline controller: add a TODO for replacing copypaste with a macrorinpatch
2020-03-01timeline controller: rate limit timelines to 3 requests per 500ms per ↵rinpatch
timeline per ip/user
2020-01-28Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-27Remove user recommendation by third party engineHakaba Hitoyo
2020-01-23fixed delete ScheduledActivityMaksim Pechnikov
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-21exclude blocked user posts from search resultsMaksim Pechnikov
2020-01-20Merge branch 'credo/version-bump-1.1.5' into 'develop'lain
Bump credo to 1.1.5 See merge request pleroma/pleroma!2115
2020-01-20Merge branch 'hashtag-benchmarks' into 'develop'Haelwenn
Hashtag benchmarks See merge request pleroma/pleroma!2116
2020-01-20Bump credo to 1.1.5Haelwenn (lanodan) Monnier
2020-01-14Mix Tasks: Add pleroma.benchmarks.tagslain
2019-12-19Return 404 if account to filter notifications from is not foundEgor Kislitsyn
2019-12-14Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-11Merge branch 'develop' into issue/1411Mark Felder
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-08Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-06ActivityPub: For user timelines, respects blocks.lain
Unless the timeline belongs to a blocked user.
2019-12-05Merge branch 'develop' into issue/1411Maksim Pechnikov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex
2019-12-04Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-04updated ScheduledActivityMaksim Pechnikov
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-12-01Merge branch 'develop' into issue/1411Maksim Pechnikov
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-19[#1335] Implemented notification mutes and reblog mutes as ↵Ivan Tashkinov
UserRelationships. User to UserRelationship relations and functions refactoring.
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-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-14Merge remote-tracking branch 'upstream/develop' into feature/move-activityEgor Kislitsyn
2019-11-12Add `allow_following_move` setting to UserEgor Kislitsyn
2019-11-11New rate limiterSteven Fuchs
2019-11-10[#1335] User: refactored :blocks field into :blocked_users relation.Ivan Tashkinov
Introduced UserBlock.
2019-11-10add subject to atom feedMaksim Pechnikov
2019-11-04excluded invisible actors from gets /api/v1/accounts/:idMaksim Pechnikov
2019-10-24Merge remote-tracking branch 'upstream/develop' into ↵Egor Kislitsyn
refactor/following-relationships
2019-10-23Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1304-user-info-deprecation # Conflicts: # lib/pleroma/notification.ex
2019-10-21Merge branch 'develop' into refactor/following-relationshipsEgor Kislitsyn
2019-10-20[#1304] Moved remaining fields from User.Info to User.Ivan Tashkinov
Misc. fixes / improvements.
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 02:33:07 +0000