aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
AgeCommit message (Expand)Author
2020-09-22Merge remote-tracking branch 'upstream/develop' into email-fix-developAlex Gleason
2020-09-21Fix #2172 HTTP error on password resetAlex Gleason
2020-09-19[#2074] OAuth scope checking in Streaming API.Ivan Tashkinov
2020-09-17Merge branch 'fix/streaming-termination-errors' into 'develop'rinpatch
2020-09-17Merge remote-tracking branch 'remotes/origin/develop' into media-preview-prox...Ivan Tashkinov
2020-09-16[#2497] Media preview proxy: misc. improvements (`static` param support, dyna...Ivan Tashkinov
2020-09-11Merge remote-tracking branch 'upstream/develop' into chat-moderationAlex Gleason
2020-09-11MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1Alex Gleason
2020-09-11Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxyIvan Tashkinov
2020-09-10schedule activity expiration in ObanAlexander Strizhakov
2020-09-10Websocket handler: fix never matching code on failed authrinpatch
2020-09-10Websocket handler: do not raise if handler is terminated before switching pro...rinpatch
2020-09-10websocket handler: Do not log client ping frames as errorsrinpatch
2020-09-08Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
2020-09-08Merge branch 'feat/rich-media-improvements' into 'develop'rinpatch
2020-09-03[#2497] Added support for enforcing output format for media proxy preview, us...Ivan Tashkinov
2020-09-03Merge branch 'develop' into media-preview-proxyMark Felder
2020-09-02Merge branch 'fix/2095-deactivated-account-reset' into 'develop'feld
2020-09-02Merge branch 'bugfix/mastoapi-lists' into 'develop'lain
2020-09-02ListController: DRY up stuff.lain
2020-09-02Disallow password resets for deactivated accounts.Mark Felder
2020-09-02StatusView: Start fetching rich media cards as soon as possiblerinpatch
2020-09-01Fix removing an account from a listHaelwenn (lanodan) Monnier
2020-09-01User table: ensure bio is always a stringrinpatch
2020-08-30Merge branch 'develop' into feld-2168-media-preview-proxyMark Felder
2020-08-27Support static avatars and header images with Mediaproxy PreviewMark Felder
2020-08-26TimelineController: Keys are atoms now.lain
2020-08-25Merge branch 'develop' into feld-2168-media-preview-proxyMark Felder
2020-08-20Pipeline Ingestion: EventHaelwenn (lanodan) Monnier
2020-08-18Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview...Ivan Tashkinov
2020-08-14[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy...Ivan Tashkinov
2020-08-11Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview...Ivan Tashkinov
2020-08-10AccountController: Build the correct update activity.lain
2020-08-07Merge branch 'features/poll-validation' into 'develop'lain
2020-08-07Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview...Ivan Tashkinov
2020-08-05Questions: Move fixes to validators.lain
2020-08-05Apply 1 suggestion(s) to 1 file(s)lain
2020-08-05Update filter_view.ex to return whole_word actual valueMK Fain
2020-08-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/po...lain
2020-07-31Merge remote-tracking branch 'pleroma/develop' into features/poll-validationHaelwenn (lanodan) Monnier
2020-07-31[#1985] Prevented force login on registration if account approval and/or emai...Ivan Tashkinov
2020-07-30Merge branch '1993-confirm-users-on-registration' into 'develop'Haelwenn
2020-07-29Merge remote-tracking branch 'upstream/develop' into hide-reactionsAlex Gleason
2020-07-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confir...lain
2020-07-29AccountController: Don't explicitly ask to keep users unconfirmed.lain
2020-07-28Let favourites and emoji reactions optionally be hiddenAlex Gleason
2020-07-26Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-23Merge branch 'unblock-domain-via-query' into 'develop'feld
2020-07-23Support blocking via query parameters as well and document the change.Mark Felder
2020-07-23Merge branch '1976-status-view-fixes' into 'develop'Haelwenn