summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
AgeCommit message (Collapse)Author
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-20StatusControllerTest: Fix typolain
2020-01-20CommonAPI: Don't error out on double favs/repeatslain
2020-01-15Fix notification controller testEgor Kislitsyn
2020-01-15Merge branch 'develop' into notifications-from-accountEgor Kislitsyn
2020-01-13Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-21Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-21Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"Maxim Filippov
This reverts merge request !2076
2019-12-20Merge branch 'feature/status-counts-by-scope' into 'develop'feld
Stats: return status counts by scope See merge request pleroma/pleroma!2076
2019-12-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
oauth-scopes-tweaks-and-tests
2019-12-19[#2068] Introduced proper OAuth tokens usage to controller tests.Ivan Tashkinov
2019-12-19Return 404 if account to filter notifications from is not foundEgor Kislitsyn
2019-12-18Stats: return status counts by scopeMaxim Filippov
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-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: ↵Ivan Tashkinov
controller tests modification: OAuth scopes usage.
2019-12-14Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-14Disable rate limiter for socket/localhost (unless RemoteIp is enabled)Maxim Filippov
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-09Merge branch 'fix/prefer-url-over-search' into 'develop'rinpatch
status search: prefer the status fetched by url over other results See merge request pleroma/pleroma!2050
2019-12-09status search: prefer the status fetched by url over other resultsrinpatch
2019-12-09Merge branch 'develop' into issue/1383Maksim Pechnikov
2019-12-09Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'lain
Fix exclude_visibilities filter for followers-only Like notifications See merge request pleroma/pleroma!1957
2019-12-08Merge branch 'develop' into issue/1342Maksim Pechnikov
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/1342Maksim Pechnikov
2019-12-05Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-12-05Merge branch 'develop' into improve-move-notificaions-apiEgor Kislitsyn
2019-12-04fix ScheduledActivityMaksim 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-04fix testMaksim Pechnikov
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-11-29Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # mix.lock
2019-11-28added User.NotificationSetting structMaksim Pechnikov
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-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