aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-06-01Resolve merge conflictsrinpatch
2019-06-01Add poll votesrinpatch
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-31Merge branch 'hotfix/leaking-lists' into 'develop'lambda
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-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
2019-05-26Merge branch 'fix/mrf-simple' into 'develop'kaniini
2019-05-26mrf: simple policy: fix matching imported activitypub and ostatus statusesWilliam Pitcock
2019-05-25remove @websub and @ostatus module-level constantsWilliam Pitcock
2019-05-25tests: websub: check only that signature validation succeeds or failsWilliam Pitcock
2019-05-25kill @httpoisonWilliam Pitcock
2019-05-25Merge branch 'fix/nodeinfo-unavailable-when-not-federating' into 'develop'kaniini
2019-05-25Keep nodeinfo available when not federatingAaron Tinio
2019-05-24Merge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'kaniini
2019-05-24Mention all people in the beginning of DMSergey Suprunenko
2019-05-24Merge branch 'feature/static-headers' into 'develop'kaniini
2019-05-24Move the Cache Control header test to its own filefeld
2019-05-24Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'lambda
2019-05-23explicitly set reverse proxy upstream to IPv4Alfie Pates
2019-05-23Change the order of preloading when fetching activities for contextrinpatch
2019-05-22Merge branch 'feature/mrf-user-filter' into 'develop'kaniini
2019-05-22Fix credo issuesrinpatch
2019-05-22Merge branch 'ssh-fixes' into 'develop'kaniini
2019-05-22update documentation for the new MRF features [no-ci]William Pitcock
2019-05-22tests: add tests for banner and avatar removalWilliam Pitcock
2019-05-22mrf: simple policy: add the ability to strip avatars and banners from user pr...William Pitcock