summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api
AgeCommit message (Collapse)Author
2020-02-07Merge branch 'cancel-follow-request' into 'develop'Haelwenn
Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175
2020-02-07Questions: Add timezone to `closed` propertyLain Soykaf
2020-02-07EmojiReactions: Add Mastodon-aligned reaction endpoints, change responseLain Soykaf
2020-02-06EmojiReactions: Rename to EmojiReactsLain Soykaf
2020-02-06Merge branch 'mastoapi-non-html-strings' into 'develop'feld
mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167
2020-02-05Add support for cancellation of a follow requestEgor Kislitsyn
2020-02-03Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-02mastodon API: do not sanitize html in non-html fieldsrinpatch
2020-01-30Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'rinpatch
Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064
2020-01-30Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhostrinpatch
2020-01-29Emoji Reactions: Add `reacted` field to emoji reactionslain
2020-01-28Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-01-28Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-28update ectoMaksim Pechnikov
2020-01-27Remove user recommendation by third party engineHakaba Hitoyo
2020-01-27Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-01-27Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-24Emoji reactions: Change api format once morelain
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-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