Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma] / lib / pleroma / web / mastodon_api /
2021-11-15 lainMerge branch 'block-behavior' into 'develop'
2021-11-15 lainMerge branch 'instance-deletion' into 'develop'
2021-11-15 lainMerge branch 'fix-object-deletion-timeout' into 'develop'
2021-11-15 lainMerge branch 'userfeed-fe-fallback' into 'develop'
2021-10-16 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-10-06 HaelwennMerge branch 'ci/bump-elixir-lint' into 'develop'
2021-10-06 Haelwenn (lanodan... CI: Bump lint stage to elixir-1.12
2021-10-06 HaelwennMerge branch 'bugfix/crypt-pragma' into 'develop'
2021-10-06 HaelwennMerge branch 'from/develop/tusooa/add-remove-emails...
2021-09-13 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-09-07 HaelwennMerge branch 'remove/mastofe' into 'develop'
2021-08-30 sadposterMerge branch 'develop' of https://git.pleroma.social...
2021-08-28 Haelwenn (lanodan... Merge branch 'release/2.4.1' into chores/2.4.1-develop
2021-08-28 HaelwennMerge branch 'docs_add_yunohost_installation' into...
2021-08-28 HaelwennMerge branch 'features/ingestion-no-nil' into 'develop'
2021-08-28 HaelwennMerge branch 'admin_fe_dont_list_mrf_policies_any_more...
2021-08-14 HaelwennMerge branch 'builder-note' into 'develop'
2021-08-13 Alex GleasonStreamer: fix crash in MastodonAPI.StatusView
2021-08-13 HaelwennMerge branch 'streamer-crash-fix' into 'develop'
2021-08-13 Alex GleasonStreamer: fix crash in MastodonAPI.StatusView
2021-08-13 rinpatchMerge branch 'dkuku-develop-patch-66061' into 'develop'
2021-08-11 HaelwennMerge branch 'bugfix/subscriptions-replies' into 'develop'
2021-08-10 HaelwennMerge branch 'bugfix/change_password' into 'develop'
2021-08-10 HaelwennMerge branch 'docs_make_otp_recommendation_clearer...
2021-08-09 HaelwennMerge branch 'fix/streaming-api-for-create-activity...
2021-08-09 HaelwennMerge branch 'poll-notification' into 'develop'
2021-08-09 HaelwennMerge branch 'simple_policy_reasons_for_instance_specif...
2021-08-08 HaelwennMerge branch 'release/2.4.0' into 'stable'
2021-08-06 Sean KingMerge branch 'develop' of git.pleroma.social:pleroma...
2021-08-06 Egor KislitsynImprove readability
2021-08-06 IljaAdd key- and valuePlaceholders for quarantined_instance...
2021-08-06 Iljaquarantine instances info
2021-08-06 IljaReturn maps in node_info
2021-08-04 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-27 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-27 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-23 sadposter:Merge branch 'develop' of https://git.pleroma.social...
2021-07-22 HaelwennMerge branch 'mkljczk-develop-patch-60115' into 'develop'
2021-07-18 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-18 Alex GleasonMastodonAPI: Support poll notification
2021-07-17 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-14 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-14 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-12 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-07-12 HaelwennMerge branch 'features/ingestion-page' into 'develop'
2021-07-10 Sean KingMerge develop branch upstream
2021-07-02 marcin mikołajczakfix the fucking list timelines on mastofe/soapbox-fe
2021-06-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-27 sadpostermerge
2021-06-10 feldMerge branch 'fix/twittercard-video-dimensions' into...
2021-06-09 HaelwennMerge branch 'cycles-plug-deps' into 'develop'
2021-06-09 Alex GleasonRefactor skipped plugs into Pleroma.Web functions
2021-06-08 feldMerge branch 'metadata-for-all' into 'develop'
2021-06-08 feldMerge branch 'improve-og-embed' into 'develop'
2021-06-08 feldMerge branch 'cycles-params' into 'develop'
2021-06-08 Alex GleasonFix order of Pleroma.Web.Utils.Params aliases
2021-06-08 Alex GleasonPleroma.Web.Params --> Pleroma.Web.Utils.Params
2021-06-08 Alex GleasonPleroma.Web.ControllerHelper.truthy_param?/1 --> Plerom...
2021-06-07 feldMerge branch 'pleromapi' into 'develop'
2021-06-07 feldMerge branch 'develop' into 'fix/prune-hashtags'
2021-06-05 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-04 Sean KingFix more build errors
2021-06-04 Sean KingFix merge conflicts with upstream
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop'
2021-06-03 HaelwennMerge branch 'chore/rename-chat' into 'develop'
2021-06-02 feldMerge branch 'Snow-develop-patch-01683' into 'develop'
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 Mark FelderAdd "chat" back as a feature for backwards compat.
2021-06-01 Mark FelderMove shout configuration from :instance, update docs...
2021-06-01 Mark FelderRename the non-federating Chat feature to Shout
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-06-01 feldMerge branch 'cycles-frontend-static' into 'develop'
2021-06-01 feldMerge branch 'cycles-base-url' into 'develop'
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop'
2021-05-31 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-31 Alex GleasonDeprecate Pleroma.Web.base_url/0
2021-05-31 HaelwennMerge branch 'docs/goto-libera' into 'develop'
2021-05-30 Alex GleasonMerge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f...
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 feldMerge branch 'cycles-views' into 'develop'
2021-05-29 feldMerge branch 'cycles-html' into 'develop'
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonBreak out activity-specific HTML functions into Pleroma...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonCreate real Views for all Controllers
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 feldMerge branch 'cycles-router-api-routes' into 'develop'
2021-05-28 feldMerge branch 'simplepolicy-announce-leak' into 'develop'
2021-05-28 feldMerge branch 'gitignore-runtime-exs' into 'develop'
2021-05-28 feldMerge branch 'alias-router-helpers' into 'develop'
2021-05-28 feldMerge branch 'plug-runtime-dev' into 'develop'
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 feldMerge branch 'cycles-router' into 'develop'
2021-05-28 feldMerge branch 'cycles-router-mediaproxy' into 'develop'
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
2021-05-28 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into...
next