aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
AgeCommit message (Collapse)Author
2020-01-27Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-25can be changed in runtimeAlexander Strizhakov
2020-01-24Emoji reactions: Change api format once morelain
2020-01-23fixed delete ScheduledActivityMaksim Pechnikov
2020-01-23Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-22Notifications: Add emoji reaction notificationslain
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-22Emoji reactions: Change cache and reply formatlain
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-21Merge branch 'emoji-reaction-extensions' into 'develop'rinpatch
StatusView: Add `emoji_reactions` See merge request pleroma/pleroma!2120
2020-01-21exclude blocked user posts from search resultsMaksim Pechnikov
2020-01-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
emoji-reaction-extensions
2020-01-20StatusView: Add `emoji_reactions`lain
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-15Merge branch 'develop' into notifications-from-accountEgor Kislitsyn
2020-01-14Mix Tasks: Add pleroma.benchmarks.tagslain
2019-12-21Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-19Return 404 if account to filter notifications from is not foundEgor Kislitsyn
2019-12-17Add ActivityPub Object Event type supportThomas Citharel
Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17Add support for `account_id` param to filter notifications by the accountEgor 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/1276Maksim Pechnikov
2019-12-08Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-08Merge branch 'improve-move-notificaions-api' into 'develop'rinpatch
Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032
2019-12-06ActivityPub: For user timelines, respects blocks.lain
Unless the timeline belongs to a blocked user.
2019-12-05Merge branch 'develop' into issue/1276Maksim Pechnikov
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' of git.pleroma.social:pleroma/pleroma into remake-remodellain
2019-12-04Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-04updated ScheduledActivityMaksim Pechnikov
2019-12-03Add `with_move` query param to the notifications APIEgor Kislitsyn
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-29Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # mix.lock
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-27Add a view for the move notificationEgor Kislitsyn
2019-11-26Add `direct_conversation_id` to web push payloadEgor Kislitsyn
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-15added recount unread notifications to markersMaksim Pechnikov