summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-01Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'kaniini
Bugfix: remove vanilla flavour See merge request pleroma/pleroma!1228
2019-06-01Merge branch 'add-missing-mock' into 'develop'kaniini
add the missing mock file [Fix the warning] See merge request pleroma/pleroma!1229
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
Dokku CI support - On-Demand review instances See merge request pleroma/pleroma!1216
2019-05-31Merge branch 'doc/mongoose-im-config' into 'develop'feld
Sample Mongoose IM config See merge request pleroma/pleroma!1226
2019-05-31Sample Mongoose IM config.feld
Change domain, ensure paths to PEM files are correct, and this is good to go.
2019-05-31Merge branch 'fix/mastodon-user-search' into 'develop'lambda
Fix/mastodon user search See merge request pleroma/pleroma!1224
2019-05-31Mastodon API search default value for "resolve" is falsefeld
https://docs.joinmastodon.org/api/rest/accounts/ https://docs.joinmastodon.org/api/rest/search/
2019-05-31Merge branch 'hotfix/leaking-lists' into 'develop'lambda
Mastodon API: Fix lists leaking private posts See merge request pleroma/pleroma!1222
2019-05-31Mastodon API: Fix lists leaking private postsrinpatch
Our previous list visibility resolver grabbed posts if either follower collection of the user in a list who is followed is in `to` or if follower collection of the user in a list was in `cc`. This not only missed unlisted posts but also lead to leaking private posts when `fix_explicit_addressing` mistakingly started putting follower collections to `cc` (also fixed in this MR). Reported by @kurisu@iscute.moe via a DM
2019-05-31Fix fix_explicit_addressing moving follower collection to cc and add tests ↵rinpatch
for it
2019-05-31CI: Add auto-deployment via dokku.lain
2019-05-30Merge branch 'fix/install-guide' into 'develop'feld
Formatting See merge request pleroma/pleroma!1219
2019-05-30Formattingfeld
2019-05-30Merge branch 'fix/install-guide' into 'develop'feld
Install docs should clone from master branch See merge request pleroma/pleroma!1218
2019-05-30Install docs should clone from master branchfeld
2019-05-30Merge branch 'fix/ogp-missing-data' into 'develop'feld
Replace missing non-nullable Card attributes with empty strings See merge request pleroma/pleroma!1217
2019-05-30Replace missing non-nullable Card attributes with empty stringsSergey Suprunenko
2019-05-30Merge branch 'use-pleroma-config' into 'develop'lambda
Use Pleroma.Config everywhere See merge request pleroma/pleroma!1214
2019-05-30Use Pleroma.Config everywhereEgor Kislitsyn
2019-05-29Merge branch 'revert-57e58d26' into 'develop'kaniini
Revert "Merge branch 'feature/search-authenticated-only' into 'develop'" See merge request pleroma/pleroma!1212
2019-05-29Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"kaniini
This reverts merge request !1209
2019-05-29Merge branch 'fix/mastodon-search-limit' into 'develop'lambda
Default search limit should be 40 See merge request pleroma/pleroma!1210
2019-05-29Merge branch 'issue/936' into 'develop'lambda
[#936] fix tests See merge request pleroma/pleroma!1208
2019-05-29[#936] fix testsMaksim
2019-05-29Default search limit should be 40Mark Felder
https://docs.joinmastodon.org/api/rest/search/
2019-05-29Merge branch 'feature/search-authenticated-only' into 'develop'kaniini
router: require oauth_read for searching Closes #935 See merge request pleroma/pleroma!1209
2019-05-29router: require oauth_read for searchingWilliam Pitcock
Search calls are generally expensive and allow unauthenticated users to crawl the instance for user profiles or posts which contain specified keywords. An adversary can build a distributed search engine which not only will consume significant instance resources, but also can be used for undesirable purposes such as datamining. Accordingly, require authenticated access to use the search API endpoints. This acts as a nice balance as it allows guest users to make use of most functionality available in Pleroma FE while ensuring that Pleroma instances are reasonably protected from resource exhaustion. It also removes Pleroma as a potential vector in distributed search engines.
2019-05-28Merge branch 'varnish-improvements' into 'develop'feld
More Varnish improvements See merge request pleroma/pleroma!667
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
Respect proxy settings federation See merge request pleroma/pleroma!1206
2019-05-28Respect proxy settings federationjeff
2019-05-26Merge branch 'refactor/die-httpoison-die' into 'develop'lambda
remove @httpoison, @ostatus and @websub compile-time constants See merge request pleroma/pleroma!1203
2019-05-26Merge branch 'fix/mrf-simple' into 'develop'kaniini
mrf: simple policy: fix matching imported activitypub and ostatus statuses Closes #915 See merge request pleroma/pleroma!1205
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
Keep nodeinfo available when not federating Closes #923 See merge request pleroma/pleroma!1202
2019-05-25Keep nodeinfo available when not federatingAaron Tinio
2019-05-24Merge branch 'bugfix/mention-all-people-in-beginning-dm' into 'develop'kaniini
Mention all people in the beginning of DM Closes #924 See merge request pleroma/pleroma!1194
2019-05-24Mention all people in the beginning of DMSergey Suprunenko
2019-05-24Merge branch 'feature/static-headers' into 'develop'kaniini
Improve serving of static assets See merge request pleroma/pleroma!1200
2019-05-24Move the Cache Control header test to its own filefeld
We can consolidate our cache control header tests here
2019-05-24Merge branch 'reverse_proxy_upstream_v4_fix' into 'develop'lambda
explicitly set reverse proxy upstream to IPv4 Closes #930 See merge request pleroma/pleroma!1197
2019-05-23explicitly set reverse proxy upstream to IPv4Alfie Pates
since Pleroma.Web.Endpoint binds on IPv4 only and `localhost.` resolves to [::0] on some systems fixes #930.
2019-05-22Merge branch 'feature/mrf-user-filter' into 'develop'kaniini
mrf: add support for filtering users See merge request pleroma/pleroma!1188
2019-05-22Merge branch 'ssh-fixes' into 'develop'kaniini
Ssh fixes Closes #869 and #925 See merge request pleroma/pleroma!1191
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 04:22:28 +0000