aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-14added tests for Web.MediaProxyMaksim
2019-07-14Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'kaniini
Unfollow should also unsubscribe Closes #1086 See merge request pleroma/pleroma!1419
2019-07-14Unfollow should also unsubscribeSergey Suprunenko
2019-07-14Merge branch 'security/ir-generic-containment' into 'develop'kaniini
security: IR-based generic object containment See merge request pleroma/pleroma!1417
2019-07-14tests: fix object containment violations in the transmogrifier testsAriadne Conill
Some objects were not completely rewritten in the tests, which caused object containment violations. Fix them by rewriting the object IDs to be in an appropriate namespace.
2019-07-14security: detect object containment violations at the IR levelAriadne Conill
It is more efficient to check for object containment violations at the IR level instead of in the protocol handlers. OStatus containment is especially a tricky situation, as the containment rules don't match those of IR and ActivityPub. Accordingly, we just always do a final containment check at the IR level before the object is added to the IR object graph.
2019-07-14Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'kaniini
remove CC-BY-NC-ND license. See merge request pleroma/pleroma!1415
2019-07-14remove CC-BY-NC-ND license.Ariadne Conill
we moved branding assets (mascot etc) to CC-BY-SA a while back.
2019-07-14Merge branch 'bugfix/llal-object-containment' into 'develop'kaniini
Object.Fetcher: Handle error on Containment.contain_origin/2 See merge request pleroma/pleroma!1414
2019-07-14Object.Fetcher: Keep the with-do block as per kaniini propositionHaelwenn (lanodan) Monnier
2019-07-14FetcherTest: Containment refute called(OStatus.fetch_activity_from_url)Haelwenn (lanodan) Monnier
2019-07-14Object.Fetcher: Fallback to OStatus only if AP actually failsHaelwenn (lanodan) Monnier
2019-07-14Merge branch 'feature/1072-muting-notifications' into 'develop'kaniini
Feature/1072 muting notifications Closes #1072 See merge request pleroma/pleroma!1398
2019-07-14Feature/1072 muting notificationsAlexander Strizhakov
2019-07-14Object.Fetcher: Handle error on Containment.contain_origin/2Haelwenn (lanodan) Monnier
2019-07-14HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.siteHaelwenn (lanodan) Monnier
2019-07-14HttpRequestMock: Add missing mocks for object containment testsHaelwenn (lanodan) Monnier
2019-07-14Merge branch 'rich_media_parsers_configurable' into 'develop'kaniini
parsers configurable See merge request pleroma/pleroma!1400
2019-07-14changelog & docsAlex S
2019-07-14parsers configurableAlex S
2019-07-13Merge branch 'feature/mrf-transparency-filter' into 'develop'kaniini
nodeinfo: implement MRF transparency exclusions See merge request pleroma/pleroma!1412
2019-07-13docs: note that exclusions usage will be included in the transparency ↵Ariadne Conill
metrics if used
2019-07-13nodeinfo: implement MRF transparency exclusionsAriadne Conill
2019-07-13Merge branch '1041-status-actions-rate-limit' into 'develop'kaniini
Rate-limited status actions (per user and per user+status). Closes #1041 See merge request pleroma/pleroma!1410
2019-07-13[#1041] Minor refactoring.Ivan Tashkinov
2019-07-13[#1041] Added documentation on existing rate limiters.Ivan Tashkinov
2019-07-13Merge branch 'fix/hackney-global-options' into 'develop'Haelwenn
Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues See merge request pleroma/pleroma!1409
2019-07-13[#1041] Rate-limited status actions (per user and per user+status).Ivan Tashkinov
2019-07-13Add a changelog entry for tolerating incorrect chain orderrinpatch
2019-07-13Merge branch 'fix/ap-hide-follows' into 'develop'Haelwenn
ActivityPub Controller: Change how hiding follows/followers is represented See merge request pleroma/pleroma!1406
2019-07-12Workaround for remote server certificate chain issuesrinpatch
2019-07-12Merge the default options with custom ones in ReverseProxy andrinpatch
Pleroma.HTTP
2019-07-12Add changelog entries for follower/following collection behaviour changesrinpatch
2019-07-12Merge branch 'develop' into fix/ap-hide-followsrinpatch
2019-07-12ActivityPub Controller: Actually pass for_user to following/followersrinpatch
views and give 403 errors when trying to request hidden follower pages when unauthenticated
2019-07-12Merge branch 'tests/web_metadata' into 'develop'kaniini
Pleroma.Web.Metadata - tests See merge request pleroma/pleroma!1401
2019-07-12Pleroma.Web.Metadata - testsMaksim
2019-07-12ActivityPub User view: Following/Followers refactoringrinpatch
- Render the collection items if the user requesting == the user rendered - Do not render the first page if hide_{followers,follows} is set, just give the URI to it
2019-07-12Merge branch 'fix/pleroma-extensions' into 'develop'kaniini
Move new endpoints to pleroma namespace in Mastodon API See merge request pleroma/pleroma!1404
2019-07-12Move these to pleroma namespace in Mastodon APIMark Felder
2019-07-12AP user view: Add a test for hiding totalItems in following/followersrinpatch
2019-07-12Merge branch 'url-parser-proxy' into 'develop'kaniini
preserve the original path/filename (no encoding/decoding) for proxy See merge request pleroma/pleroma!1403
2019-07-12preserve the original path/filename (no encoding/decoding) for proxySachin Joshi
2019-07-11Merge branch 'search-limit-offset-type' into 'develop'kaniini
Add account_id, type, limit, and offset to GET /api/v1/search and /api/v2/search See merge request pleroma/pleroma!1386
2019-07-11Extend Pleroma.Pagination to support offset-based pagination, use ↵Eugenij
async/await to execute status and account search in parallel
2019-07-11Merge branch 'admin-configure' into 'develop'kaniini
admin api configure changes See merge request pleroma/pleroma!1345
2019-07-11admin api configure changesAlexander Strizhakov
2019-07-11Merge branch 'fix/1019-refactor' into 'develop'kaniini
Fix/1019 refactor See merge request pleroma/pleroma!1397
2019-07-11Merge branch 'chore/mailmap' into 'develop'kaniini
add mailmap [ci skip] See merge request pleroma/pleroma!1399
2019-07-11add mailmap [ci skip]Ariadne Conill
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 16:11:10 +0000