aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2019-06-03Use workaround for the heavy checkmark symbol in iOSeugenijm
2019-06-03Merge branch 'develop' into update-oauth-templateMark Felder
2019-06-03add option skip_thread_containmentMaksim Pechnikov
2019-06-03Merge branch 'develop' into feature/polls-2-electric-boogalorinpatch
2019-06-03Merge branch 'align-mastodon-conversations' into 'develop'lambda
Mastodon Conversations API: Align to Mastodon behavior See merge request pleroma/pleroma!1215
2019-06-03Merge branch 'develop' into feature/polls-2-electric-boogalorinpatch
2019-06-03Change query order in fetch_activities_for_context_query to make poll vote ↵rinpatch
exclusion work
2019-06-02Remove a TODO comment as the tests for poll view were writtenrinpatch
2019-06-02Make error message about author's inability to vote more sensiblerinpatch
2019-06-02Refresh the object in CommonAPI.vote instead of MastoAPI controllerrinpatch
2019-06-02formattingWilliam Pitcock
2019-06-02mrf: add subchain policyWilliam Pitcock
2019-06-02mrf: allow a policy chain to be specified when filteringWilliam Pitcock
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-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-01Remove all follower collections but actor's from "cc"Sergey Suprunenko
2019-06-01visibility: if litepub:directMessage is asserted, always report the object ↵William Pitcock
as "direct" visibility
2019-06-01Remove now useless flavours switchingHaelwenn (lanodan) Monnier
2019-06-01mastodon_api_controller.ex: Remove vanilla from supported_flavoursHaelwenn (lanodan) Monnier
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-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-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-29Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"kaniini
This reverts merge request !1209
2019-05-29Default search limit should be 40Mark Felder
https://docs.joinmastodon.org/api/rest/search/
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-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-26mrf: simple policy: fix matching imported activitypub and ostatus statusesWilliam Pitcock
2019-05-26notification: remove local/remote match rules (too complicated)William Pitcock
2019-05-25user info: allow formdata for notification settings like every other APIWilliam Pitcock
2019-05-25twitter api: user view: expose user notification settings under pleroma objectWilliam Pitcock
2019-05-25notification: add non_follows/non_followers notification control settingsWilliam Pitcock
2019-05-25remove @websub and @ostatus module-level constantsWilliam Pitcock
2019-05-25kill @httpoisonWilliam Pitcock
2019-05-25Keep nodeinfo available when not federatingAaron Tinio
2019-05-24Mention all people in the beginning of DMSergey Suprunenko
2019-05-24Move the Cache Control header test to its own filefeld
We can consolidate our cache control header tests here