aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-02Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop'kaniini
reverse proxy: clean up some @hackney leftovers See merge request pleroma/pleroma!1232
2019-06-02reverse proxy: clean up some @hackney leftoversWilliam Pitcock
2019-06-02Merge branch 'feature/notification-control-part-2' into 'develop'kaniini
notification controls, part 2 See merge request pleroma/pleroma!1204
2019-06-01Remove index on object name used for excluding poll votes (replaced by just ↵rinpatch
rewriting Note to Answer)
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
Also in this commit by accident: - Fix query ordering causing exclude_poll_votes to not work - Do not create notifications for Answer objects
2019-06-01Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'kaniini
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility See merge request pleroma/pleroma!1230
2019-06-01Merge branch 'bugfix/remove-others-follower-collections' into 'develop'kaniini
Remove all follower collections but actor's from "cc" Closes #858 See merge request pleroma/pleroma!1225
2019-06-01Remove all follower collections but actor's from "cc"Sergey Suprunenko
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-01visibility: if litepub:directMessage is asserted, always report the object ↵William Pitcock
as "direct" visibility
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-31Setting Store: Document in changelog.lain
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-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
This is to provide a generic frontend settings storage mechanism for all kinds of frontends.
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-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
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