2784 Commits (f4e2595592ccca6cedd64669baef7bdd2a6547d0)

Author	SHA1	Message	Date
Mark Felder	f4e2595592	Merge branch 'develop' into update-oauth-template	5 years ago
rinpatch	dc91bcc0af	Merge branch 'develop' into feature/polls-2-electric-boogalo	5 years ago
lambda	314758c25b	Merge branch 'align-mastodon-conversations' into 'develop' ... Mastodon Conversations API: Align to Mastodon behavior See merge request pleroma/pleroma!1215	5 years ago
rinpatch	026b245dbc	Merge branch 'develop' into feature/polls-2-electric-boogalo	5 years ago
rinpatch	5bd41fef8b	Change query order in fetch_activities_for_context_query to make poll vote exclusion work	5 years ago
rinpatch	1fd8e19d76	Remove a TODO comment as the tests for poll view were written	5 years ago
rinpatch	2fe3a20638	Make error message about author's inability to vote more sensible	5 years ago
rinpatch	e3c460353d	Refresh the object in CommonAPI.vote instead of MastoAPI controller	5 years ago
kaniini	5402d04e3c	Merge branch 'feature/notification-control-part-2' into 'develop' ... notification controls, part 2 See merge request pleroma/pleroma!1204	5 years ago
rinpatch	6bc9e5c020	Mastodon API: Refresh the object before rendering it after voting	5 years ago
rinpatch	444406167b	Mastodon API: actually check for poll votes	5 years ago
rinpatch	65db5e9f52	Resolve merge conflicts	5 years ago
rinpatch	300d94c628	Add poll votes ... Also in this commit by accident: - Fix query ordering causing exclude_poll_votes to not work - Do not create notifications for Answer objects	5 years ago
kaniini	e706b42f51	Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop' ... visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility See merge request pleroma/pleroma!1230	5 years ago
Sergey Suprunenko	2bbc2a801f	Remove all follower collections but actor's from "cc"	5 years ago
William Pitcock	f2efe24cf8	visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility	5 years ago
Haelwenn (lanodan) Monnier	5d3ece2861	Remove now useless flavours switching	5 years ago
Haelwenn (lanodan) Monnier	aa9f52edd2	mastodon_api_controller.ex: Remove vanilla from supported_flavours	5 years ago
lambda	2993361075	Merge branch 'hotfix/leaking-lists' into 'develop' ... Mastodon API: Fix lists leaking private posts See merge request pleroma/pleroma!1222	5 years ago
rinpatch	d9c0650ff9	Mastodon API: Fix lists leaking private posts ... 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	5 years ago
rinpatch	a9eaa55885	Fix fix_explicit_addressing moving follower collection to cc and add tests for it	5 years ago
lain	97fb50d9fa	Mastodon Conversation API: Don't return own account in 'accounts'.	5 years ago
Sergey Suprunenko	1690be991e	Replace missing non-nullable Card attributes with empty strings	5 years ago
lambda	91ac8b075b	Merge branch 'use-pleroma-config' into 'develop' ... Use Pleroma.Config everywhere See merge request pleroma/pleroma!1214	5 years ago
Egor Kislitsyn	99f70c7e20	Use Pleroma.Config everywhere	5 years ago
kaniini	6aec0d1b58	Revert "Merge branch 'feature/search-authenticated-only' into 'develop'" ... This reverts merge request !1209	5 years ago
Mark Felder	672fddb721	Default search limit should be 40 ... https://docs.joinmastodon.org/api/rest/search/	5 years ago
William Pitcock	0159a6dbe9	router: require oauth_read for searching ... 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.	5 years ago
lambda	5bb843ceec	Merge branch 'refactor/die-httpoison-die' into 'develop' ... remove @httpoison, @ostatus and @websub compile-time constants See merge request pleroma/pleroma!1203	5 years ago
William Pitcock	79503ce90f	mrf: simple policy: fix matching imported activitypub and ostatus statuses	5 years ago
William Pitcock	59a703fcbe	twitter api: user view: expose user notification settings under pleroma object	5 years ago
William Pitcock	56fd7dbdd7	remove @websub and @ostatus module-level constants	5 years ago
William Pitcock	9bec891eb4	kill @httpoison	5 years ago
Aaron Tinio	9415932af5	Keep nodeinfo available when not federating	5 years ago
feld	f916e4cdd9	Move the Cache Control header test to its own file ... We can consolidate our cache control header tests here	5 years ago
rinpatch	8b2d39c1ec	Change the order of preloading when fetching activities for context	5 years ago
rinpatch	e6b175ed6c	Fix credo issues	5 years ago
William Pitcock	baf72d6c58	mrf: simple policy: add the ability to strip avatars and banners from user profiles	5 years ago
William Pitcock	60f882b09f	activitypub: run user objects through MRF filters	5 years ago
William Pitcock	75b6c4b004	mrf: defang policy modules for filtering user profile objects	5 years ago
rinpatch	ac7702f800	Exclude Answers from fetching by default	5 years ago
rinpatch	19c90d47c4	Normalize poll votes to Answer objects	5 years ago
Maksim	620908a2db	[#699] add worker to clean expired oauth tokens	5 years ago
lambda	ff363f70b5	Merge branch 'refactor/keys' into 'develop' ... move key generation functions into Pleroma.Keys module See merge request pleroma/pleroma!1186	5 years ago
William Pitcock	1344c85e2f	salmon: fix credo	5 years ago
rinpatch	cdac5efd10	Merge branch 'bugfix/account_view_source.note' into 'develop' ... MastoAPI AccountView: fill source.note with plaintext version of note Closes #926 See merge request pleroma/pleroma!1189	5 years ago
Haelwenn (lanodan) Monnier	0e2c215a00	MastoAPI AccountView: fill source.note with plaintext version of note ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/926	5 years ago
kaniini	79c2cef2fb	Merge branch 'mongooseim-support' into 'develop' ... MongooseIM: Add basic integration endpoints. See merge request pleroma/pleroma!1172	5 years ago
William Pitcock	045803346d	move key generation functions into Pleroma.Keys module	5 years ago
Aaron Tinio	3ab9255eda	Respond with a 404 Not implemented JSON error message ... when requested API is not implemented	5 years ago