fix merge
[akkoma] / docs / api / differences_in_mastoapi_responses.md
2019-06-04 Maksim Pechnikovfix merge
2019-06-04 Maksim PechnikovMerge branch 'develop' into issue/941
2019-06-04 kaniiniMerge branch 'feature/mrf-subchain' into 'develop'
2019-06-04 kaniiniMerge branch 'generic-fe-settings' into 'develop'
2019-06-03 Maksim Pechnikovupdate api to set skip_thread_containment
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-31 lainDocumentation: Document Settings store mechanism.
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-14 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-13 lambdaMerge branch 'feature/federator-behaviours' into 'develop'
2019-05-13 kaniiniMerge branch 'features/mastoapi/2.7.0-registration...
2019-05-13 Alexander Strizhakovdifferences_in_mastoapi_responses.md: fullname & bio...
2019-05-13 lambdaMerge branch 'mascot/pleroma-tan-shy' into 'develop'
2019-05-07 kaniiniMerge branch 'docs/MRF-modules' into 'develop'
2019-05-07 lambdaMerge branch 'conversations_three' into 'develop'
2019-05-07 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-06 lambdaMerge branch 'issue_800' into 'develop'
2019-05-06 Maksimfix format
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-30 Sachin JoshiMerge branch 'develop' into bugfix/web-notification...
2019-04-29 rinpatchMerge branch 'fix/add-default-scope-mastoapi' into...
2019-04-27 rinpatchAdd default_scope to /api/v1/update_credentials
2019-04-26 lambdaMerge branch 'feature/807-bookmark-endpoint-extension...
2019-04-26 kaniiniMerge branch 'feature/mastoapi-new-config' into 'develop'
2019-04-25 rinpatchMove settings to Source subentity
2019-04-25 Egor KislitsynMerge branch 'develop' into feature/disable-account
2019-04-24 rinpatchFix leaking private configuration parameters in Mastodo...
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into...
2019-04-23 kaniiniMerge branch 'mastoapi/add-in-reply-to-screen-name...
2019-04-22 rinpatchAdd `pleroma.in_reply_to_account_acct` to MastoAPI...
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-22 kaniiniMerge branch 'rework-emoji-management' into 'develop'
2019-04-21 rinpatchMerge branch 'docs/posting_formatted' into 'develop'
2019-04-21 Haelwenn (lanodan... differences_in_mastoapi_responses.md: `content_type...
2019-04-19 kaniiniMerge branch 'feature/database-compaction' into 'develop'
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into...
2019-04-18 HaelwennMerge branch 'bugfix/filter-boosted-blocks' into 'develop'
2019-04-18 kaniiniMerge branch 'fix/mastoapi-search-unauth' into 'develop'
2019-04-18 Mark FelderDo not require authentication for user search in MastoAPI
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination...
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop'
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 kaniiniMerge branch 'fix/hackney_max_body_param' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-10 lambdaMerge branch 'feature/767-multiple-use-invite-token...
2019-04-10 SadposterMerge branch 'develop' into feature/user-status-subscri...
2019-04-10 kaniiniMerge branch 'hotfix/fix_undefined_summary' into 'develop'
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-09 rinpatchMerge branch 'mastoapi/plaintext-statuses' into 'develop'
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-08 lainMerge branch 'features/mastoapi/2.6.0-conversations...
2019-04-06 Alex SMerge develop to 770-add-emoji-tags
2019-04-04 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-03 lambdaMerge branch 'feature/robotstxt' into 'develop'
2019-04-03 lambdaMerge branch 'fix/preview-not-working-with-form-data...
2019-04-02 rinpatchFix preview not being usable in form data
2019-04-02 HaelwennMerge branch 'fix-slow-relationships' into 'develop'
2019-04-02 lambdaMerge branch 'bugfix/wrong-date-format' into 'develop'
2019-04-02 lambdaMerge branch 'feature/fake-statuses' into 'develop'
2019-04-02 lambdaMerge branch 'bugfix/share-mastodon' into 'develop'
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 rinpatchRename fake param to preview and make the tests check...
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-01 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-29 rinpatchdocument fake option
2019-03-29 lambdaMerge branch 'sayonara-gitlab-wiki' into 'develop'
2019-03-28 rinpatchMove out of Gitlab Wiki
2017-01-01 rinpatchProvide plaintext representations of content/cw in...