Resolve conflicts
[akkoma] / docs / api /
2019-06-28 Roman ChvanikovResolve conflicts
2019-06-28 lainMerge branch 'release-docs' into 'develop'
2019-06-27 kaniiniMerge branch 'idempotency-plug' into 'develop'
2019-06-27 kaniiniMerge branch 'fix/admin-configure' into 'develop'
2019-06-27 Alexander Strizhakovdon't delete config settings on admin update
2019-06-26 rinpatchMerge branch 'update-mastofe/glitch-soc-2019-06-26...
2019-06-23 kaniiniMerge branch 'bind-to-localhost' into 'develop'
2019-06-23 kaniiniMerge branch 'rich_media_titles_two' into 'develop'
2019-06-23 kaniiniMerge branch 'admin-config' into 'develop'
2019-06-23 Alex Ssupport for config groups
2019-06-22 Alex Ssupport for tuples with more than 2 values
2019-06-16 rinpatchMerge branch 'fix/991-version-generation' into 'develop'
2019-06-15 lainMerge branch 'bugfix/980-polls-double-vote' into 'develop'
2019-06-15 kaniiniMerge branch '963_oob_oauth_redirect_fix' into 'develop'
2019-06-15 rinpatchMerge branch 'feature/add-chat-token-to-masto-api'...
2019-06-15 lainDocumentation: Document chat token response.
2019-06-14 rinpatchMerge branch 'feature/add-background-image-to-mastoapi...
2019-06-14 kaniiniMerge branch 'feature/905-dynamic-configuration-in...
2019-06-14 Alexander Strizhakovit is changed in compile time
2019-06-14 lainMastodon API: Document changes.
2019-06-06 Roman ChvanikovResolve conflicts
2019-06-05 kaniiniMerge branch 'explicit-addressing' into 'develop'
2019-06-04 Roman ChvanikovFix conflict
2019-06-04 HaelwennMerge branch 'remove-tag-warning' into 'develop'
2019-06-04 HaelwennMerge branch 'bugfix/956-activity-id-nil-conversations...
2019-06-04 lainMerge branch 'issue/941' into 'develop'
2019-06-04 Maksim PechnikovMerge branch 'develop' into issue/941
2019-06-04 Maksim Pechnikovfix merge
2019-06-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-06-04 lainDocs: Add Explicit addressing to Readme and changelog.
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 Mark FelderMerge branch 'develop' into feature/digest-email
2019-06-03 Maksim Pechnikovupdate api to set skip_thread_containment
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-06-03 lambdaMerge branch 'align-mastodon-conversations' into 'develop'
2019-06-03 rinpatchMerge branch 'develop' into feature/polls-2-electric...
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'...
2019-06-01 rinpatchResolve merge conflicts
2019-06-01 kaniiniMerge branch 'bugfix/visibility-indicator-litepub-dm...
2019-06-01 kaniiniMerge branch 'bugfix/remove-vanilla-flavour' into ...
2019-05-31 Haelwenn (lanodan... Remove now useless flavours switching
2019-05-31 lainDocumentation: Document Settings store mechanism.
2019-05-29 Roman ChvanikovMerge develop
2019-05-22 rinpatchMerge branch 'bugfix/account_view_source.note' into...
2019-05-22 kaniiniMerge branch 'mongooseim-support' into 'develop'
2019-05-20 kaniiniMerge branch 'refactor/add-virtual-thread-muted-field...
2019-05-20 kaniiniMerge branch 'feature/user-configurable-mascot' into...
2019-05-20 SadposterAdd API endpoints for a custom user mascot
2019-05-18 rinpatchResolve merge conflicts and remove IO.inspects
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-17 lainMerge branch 'develop' of git.pleroma.social:pleroma...
2019-05-16 kaniiniMerge branch 'feature/890-add-report-uri' into 'develop'
2019-05-16 feldMerge branch 'feature/admin-api-reports' into 'develop'
2019-05-16 Sergey SuprunenkoAdd Reports to Admin API
2019-05-16 feldMerge branch 'fix/domain-unblocked-reblogs' into 'develop'
2019-05-16 Mark FelderMerge branch 'develop' into conversations-import
2019-05-16 lambdaMerge branch 'feature/sql-thread-sat' into 'develop'
2019-05-16 Alex SMerge branch 'develop' into feature/890-add-report-uri
2019-05-16 kaniiniMerge branch 'docs/update_debian_instructions' into...
2019-05-16 kaniiniMerge branch 'chore/docs-update' into 'develop'
2019-05-15 Angelina FilippovaNote that nicknames is an array
2019-05-15 Angelina FilippovaNote that nicknames is an array
2019-05-15 Angelina FilippovaUpdate tag/untag docs
2019-05-15 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-14 lambdaMerge branch 'refactor/use-job-queue-everywhere' into...
2019-05-14 kaniiniMerge branch 'fix/pleroma-config-get-when-value-is...
2019-05-14 kaniiniMerge branch 'feature/disable-account' into 'develop'
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-11 kaniiniMerge branch 'fix/ostatus-activity-representer-depends...
2019-05-11 kaniiniMerge branch 'fix/readme-release' into 'develop'
2019-05-11 kaniiniMerge branch 'uniform-admin-api-url' into 'develop'
2019-05-11 Sachin Joshimake url uniform in admin api
2019-05-11 Roman ChvanikovMerge develop
2019-05-08 kaniiniMerge branch 'feature/761-add-users-filtration' into...
2019-05-08 Alexander StrizhakovMerge develop
2019-05-08 Roman ChvanikovMerge 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-30 Roman ChvanikovMerge develop
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
next