aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-06-01Fix Credo issuesrinpatch
2019-06-01Mastodon API: Refresh the object before rendering it after votingrinpatch
2019-06-01Mastodon API: actually check for poll votesrinpatch
2019-06-01Resolve merge conflictsrinpatch
2019-06-01Add poll votesrinpatch
2019-06-01Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'kaniini
2019-06-01Merge branch 'bugfix/remove-others-follower-collections' into 'develop'kaniini
2019-06-01Remove all follower collections but actor's from "cc"Sergey Suprunenko
2019-06-01Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'kaniini
2019-06-01Merge branch 'add-missing-mock' into 'develop'kaniini
2019-06-01visibility: if litepub:directMessage is asserted, always report the object as...William Pitcock
2019-06-01add the missing mock fileSachin Joshi
2019-06-01Remove now useless flavours switchingHaelwenn (lanodan) Monnier
2019-06-01mastodon_api_controller.ex: Remove vanilla from supported_flavoursHaelwenn (lanodan) Monnier
2019-05-31Merge branch 'dokku' into 'develop'Haelwenn
2019-05-31Merge branch 'doc/mongoose-im-config' into 'develop'feld
2019-05-31Sample Mongoose IM config.feld
2019-05-31Merge branch 'fix/mastodon-user-search' into 'develop'lambda
2019-05-31Mastodon API search default value for "resolve" is falsefeld
2019-05-31Setting Store: Document in changelog.lain
2019-05-31Merge branch 'hotfix/leaking-lists' into 'develop'lambda
2019-05-31Documentation: Document Settings store mechanism.lain
2019-05-31MastodonAPI: Add extension to set and get pleroma_settings_store.lain
2019-05-31AccountView: settings -> settings_storelain
2019-05-31User: Add settings store to Info, AccountViewlain
2019-05-31Mastodon API: Fix lists leaking private postsrinpatch
2019-05-31Fix fix_explicit_addressing moving follower collection to cc and add tests fo...rinpatch
2019-05-31Mastodon Conversation API: Don't return own account in 'accounts'.lain
2019-05-31CI: Add auto-deployment via dokku.lain
2019-05-30Merge branch 'fix/install-guide' into 'develop'feld
2019-05-30Formattingfeld
2019-05-30Merge branch 'fix/install-guide' into 'develop'feld
2019-05-30Install docs should clone from master branchfeld
2019-05-30Merge branch 'fix/ogp-missing-data' into 'develop'feld
2019-05-30Replace missing non-nullable Card attributes with empty stringsSergey Suprunenko
2019-05-30Merge branch 'use-pleroma-config' into 'develop'lambda
2019-05-30Use Pleroma.Config everywhereEgor Kislitsyn
2019-05-29Merge branch 'revert-57e58d26' into 'develop'kaniini
2019-05-29Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"kaniini
2019-05-29Merge branch 'fix/mastodon-search-limit' into 'develop'lambda
2019-05-29Merge branch 'issue/936' into 'develop'lambda
2019-05-29[#936] fix testsMaksim
2019-05-29Default search limit should be 40Mark Felder
2019-05-29Merge branch 'feature/search-authenticated-only' into 'develop'kaniini
2019-05-29router: require oauth_read for searchingWilliam Pitcock
2019-05-28Merge branch 'varnish-improvements' into 'develop'feld
2019-05-28Improve Varnish config. We set sane headers from the backend now.feld
2019-05-28Merge branch 'respect-proxy-settings-federation' into 'develop'kaniini
2019-05-28Respect proxy settings federationjeff
2019-05-26Merge branch 'refactor/die-httpoison-die' into 'develop'lambda