summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-15Merge branch 'admin-configure-atom-keys' into 'develop'kaniini
admin configure - atom keys with leading : See merge request pleroma/pleroma!1424
2019-07-15Merge branch 'tests/http_signature' into 'develop'kaniini
tests for Pleroma.Signature See merge request pleroma/pleroma!1426
2019-07-15tests for Pleroma.SignatureMaksim
2019-07-15Merge branch 'feature/addressable-lists' into 'develop'kaniini
[#802] Add addressable lists See merge request pleroma/pleroma!1113
2019-07-15migrating task refactorAlex S
2019-07-15atom keys with leading :Alex S
2019-07-15List messages must be visible for mentioned usersEgor Kislitsyn
2019-07-15Dependencies: Update tzdata and related packages.lain
2019-07-15Add `listMessage` to to the JSON-LD contextEgor Kislitsyn
2019-07-15Update documentationEgor Kislitsyn
2019-07-15Add an explanation comment to Publisher.publish/2Egor Kislitsyn
2019-07-15Merge remote-tracking branch 'pleroma/develop' into feature/addressable-listsEgor Kislitsyn
2019-07-15Support `list` visibility in StatusViewEgor Kislitsyn
2019-07-14Merge branch 'tests/media_proxy' into 'develop'kaniini
added tests for Web.MediaProxy See merge request pleroma/pleroma!1418
2019-07-14added tests for Web.MediaProxyMaksim
2019-07-14Update DigestEmailWorker to compile and send emails via queueRoman Chvanikov
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-14Make opts optional in Pleroma.Notification.for_user_query/2Roman Chvanikov
2019-07-14Merge branch 'develop' into feature/digest-emailRoman Chvanikov
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-14detect and use sha512-crypt for stored password hash.Moonman
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-14Add follow information refetching after following/unfollowingrinpatch
2019-07-14Add tests for fetch_follow_information_for_user and check object typerinpatch
when fetching the page
2019-07-14Merge branch 'develop' into feature/admin-api-user-statusesMaxim Filippov
2019-07-14Admin API: Endpoint for fetching latest user's statusesMaxim Filippov
2019-07-14Use atoms when updating user inforinpatch
2019-07-13Refactor fetching follow information to a separate functionrinpatch
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-13Refactor Follows/Followers counter syncronizationrinpatch
- Actually sync counters in the database instead of info cache (which got overriden after user update was finished anyway) - Add following count field to user info - Set hide_followers/hide_follows for remote users based on http status codes for the first collection page
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