aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api
AgeCommit message (Collapse)Author
2020-08-18Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy
2020-08-14[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance ↵Ivan Tashkinov
privacy setting (i.e. restrict on private instances only by default).
2020-08-11Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # mix.lock
2020-08-10AccountController: Build the correct update activity.lain
Will fix federation issues.
2020-08-07Clean up account aliasesAlex Gleason
2020-08-07Merge remote-tracking branch 'upstream/develop' into aliasesAlex Gleason
2020-08-07Merge branch 'features/poll-validation' into 'develop'lain
Poll and votes pipeline ingestion Closes #1362 and #1852 See merge request pleroma/pleroma!2635
2020-08-07Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # mix.lock
2020-08-05Merge remote-tracking branch 'upstream/develop' into restrict-domainAlex Gleason
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 ↵lain
features/poll-validation
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 ↵Ivan Tashkinov
email confirmation needed. Refactored login code in OAuthController, reused in AccountController. Added tests.
2020-07-30Merge branch '1993-confirm-users-on-registration' into 'develop'Haelwenn
AccountController: Don't explicitly ask to keep users unconfirmed. Closes #1993 See merge request pleroma/pleroma!2809
2020-07-29Merge remote-tracking branch 'upstream/develop' into hide-reactionsAlex Gleason
2020-07-29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
1993-confirm-users-on-registration
2020-07-29AccountController: Don't explicitly ask to keep users unconfirmed.lain
Confirmation is set in User.register_changeset based on the config settings.
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
Allow unblocking a domain via query params Closes #1971 See merge request pleroma/pleroma!2783
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
StatusView: Handle badly formatted emoji reactions. Closes #1976 See merge request pleroma/pleroma!2788
2020-07-23[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.Ivan Tashkinov
2020-07-22[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish ↵Ivan Tashkinov
:restrict_unauthenticated. Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22StatusView: Handle badly formatted emoji reactions.Lain Soykaf
2020-07-21Allow unblocking a domain via query paramsEgor Kislitsyn
2020-07-19Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
2168-media-preview-proxy # Conflicts: # config/config.exs # lib/pleroma/web/media_proxy/media_proxy.ex # mix.lock # test/web/media_proxy/media_proxy_test.exs
2020-07-18Allow restricting public timeline by instanceAlex Gleason
2020-07-17Add account aliasesAlex Gleason
2020-07-17Expose the post formats in /api/v1/instanceMark Felder
2020-07-15Use `approval_required` in /api/v1/instanceAlex Gleason
2020-07-15MastoAPI: fix & test giving MRF reject reasonsHaelwenn (lanodan) Monnier
2020-07-15question_validator: fix for mastodon poll expirationHaelwenn (lanodan) Monnier
Mastodon activities do not have a "closed" field, this could be seen on https://pouet.it/users/lanodan_tmp/statuses/104345126997708380 which runs Mastodon 3.1.4 (SDF runs 3.1.2)
2020-07-15Fix multiple-choice poll detectionHaelwenn (lanodan) Monnier
2020-07-12Add `account_approval_required` instance settingAlex Gleason
2020-07-10Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
chat-federation-information
2020-07-09Merge branch '1723-token-fixes' into 'develop'lain
AccountController: Return scope in proper format. Closes #1723 See merge request pleroma/pleroma!2694
2020-07-09Merge branch 'features/favicons' into 'develop'lain
Add support for remote favicons See merge request pleroma/pleroma!2261
2020-07-09Merge branch '1925-muting-reblogs' into 'develop'Haelwenn
AccountController: Fix muting / unmuting reblogs. Closes #1925 See merge request pleroma/pleroma!2732
2020-07-09Merge branch 'bugfix/status-deletion' into 'develop'lain
#1920 fix activity deletion See merge request pleroma/pleroma!2721
2020-07-08Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'lain
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting Closes #1895 See merge request pleroma/pleroma!2731
2020-07-08[#1895] credo fix.Ivan Tashkinov
2020-07-08AccountController: Fix muting / unmuting reblogs.lain
2020-07-08[#1895] Applied code review suggestion.Ivan Tashkinov
2020-07-08Add [:instances_favicons, :enabled] setting, defaults to falseHaelwenn (lanodan) Monnier
2020-07-08Use instances table instead of CachexHaelwenn (lanodan) Monnier
2020-07-08Move get_favicon to Pleroma.Instances, use /Haelwenn (lanodan) Monnier
2020-07-08Add support for remote faviconsHaelwenn (lanodan) Monnier
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 03:18:41 +0000