summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers
AgeCommit message (Expand)Author
2020-02-11Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-10Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-10Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-07Merge branch 'cancel-follow-request' into 'develop'Haelwenn
2020-02-07Questions: Add timezone to `closed` propertyLain Soykaf
2020-02-06Merge branch 'mastoapi-non-html-strings' into 'develop'feld
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 'develop' into fix/disable-rate-limiter-for-socket-localhostrinpatch
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-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-21exclude blocked user posts from search resultsMaksim Pechnikov
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-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-17Add support for `account_id` param to filter notifications by the accountEgor Kislitsyn
2019-12-15OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: co...Ivan Tashkinov
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-09Merge branch 'fix/prefer-url-over-search' into 'develop'rinpatch
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
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
2019-12-06ActivityPub: For user timelines, respects blocks.lain
2019-12-05Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-12-04fix ScheduledActivityMaksim Pechnikov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
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
2019-11-21Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-21Merge branch 'issue/1348' into 'develop'lain
2019-11-20Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-20Fix sporadically failing testEgor Kislitsyn
2019-11-19[#1335] Implemented notification mutes and reblog mutes as UserRelationships....Ivan Tashkinov
2019-11-15added recount unread notifications to markersMaksim Pechnikov