aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
AgeCommit message (Expand)Author
2020-05-12Expand and authorize streams in Streamer directly (backport from !2519)href
2020-05-02Merge branch '1559-follow-request-notifications' into 'develop'rinpatch
2020-05-01Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'rinpatch
2020-04-02Merge branch 'feature/funkwhale-audio' into 'develop'Haelwenn
2020-04-02Merge branch 'bugfix/funkwhale-channel' into 'develop'Haelwenn
2020-03-31Merge branch 'bugfix/profile-bio-newline' into 'develop'rinpatch
2020-03-31Merge branch 'admin-api-change-password' into 'develop'lain
2020-03-31Merge branch '1364-notifications-sending-control' into 'develop'rinpatch
2020-03-16Merge branch 'features/staticfe-sanitization' into 'develop'rinpatch
2020-03-15auth_controller.ex: Add admin scope to MastoFEHaelwenn (lanodan) Monnier
2020-03-15Merge branch 'fix/signup-without-email' into 'develop'feld
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
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 timelin...rinpatch
2020-02-18Fix `status.expires_at` typeEgor Kislitsyn
2020-02-15MastodonAPI.StatusView: Do not use site_nameHaelwenn (lanodan) Monnier
2020-02-11Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulgelain
2020-02-10Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-07EmojiReactions: Add Mastodon-aligned reaction endpoints, change responseLain Soykaf
2020-02-06Merge branch 'mastoapi-non-html-strings' into 'develop'feld
2020-02-03Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-02-02mastodon API: do not sanitize html in non-html fieldsrinpatch
2020-01-29Emoji Reactions: Add `reacted` field to emoji reactionslain
2020-01-28Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-27Remove user recommendation by third party engineHakaba Hitoyo
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
2020-01-21exclude blocked user posts from search resultsMaksim Pechnikov
2020-01-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-react...lain
2020-01-20StatusView: Add `emoji_reactions`lain
2020-01-20Merge branch 'credo/version-bump-1.1.5' into 'develop'lain
2020-01-20Merge branch 'hashtag-benchmarks' into 'develop'Haelwenn
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
2019-12-17Add support for `account_id` param to filter notifications by the accountEgor Kislitsyn
2019-12-14Merge branch 'develop' into issue/1383Maksim Pechnikov