aboutsummaryrefslogtreecommitdiff
path: root/test
AgeCommit message (Collapse)Author
2020-06-26Merge branch 'block-handling' into 'develop'Haelwenn
Handle blocks with the pipeline See merge request pleroma/pleroma!2685
2020-06-26Merge branch '1258-anti-link-spam-exemption' into 'develop'Haelwenn
AntiSpamLinkPolicy: Exempt local users. Closes #1258 See merge request pleroma/pleroma!2686
2020-06-26Simplify notification filtering settings furtherMark Felder
2020-06-26Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-06-26StaticFE: Prioritize json in requests.lain
2020-06-26AccountController: Return scope in proper format.lain
2020-06-26Preloading: Fix nodeinfo url.lain
2020-06-26Preloading: Return correct data for statusnet stuff.lain
2020-06-26Nodeinfo: Add chat information back in.lain
2020-06-26User: Don't unfollow on block when the relevant setting is set.lain
2020-06-26BlockValidator: Restore old behavior for incoming blocks.lain
2020-06-26activity_draft: Add source fieldHaelwenn (lanodan) Monnier
2020-06-25Merge branch 'preload-data' into 'develop'feld
Preload data into index.html Closes #1660 See merge request pleroma/pleroma!2381
2020-06-25Merge branch 'develop' into refactor/notification_settingsMark Felder
2020-06-25AntiSpamLinkPolicy: Exempt local users.lain
2020-06-25Merge branch 'issue/1872-ex_aws' into 'develop'lain
[#1872] use Pleroma.HTTP for ExAws.S3 See merge request pleroma/pleroma!2683
2020-06-25Blocking: Don't federate if the options is set.lain
2020-06-25ActivityPub: Remove `block`.lain
2020-06-25Transmogrifier: Switch to pipeline for Blocks.lain
2020-06-25ObjectValidator: Basic `Block` support.lain
2020-06-25Transmogrifier Test: Extract block handling.lain
2020-06-25Merge branch 'fix/following-request-from-deactivated' into 'develop'lain
Filter outstanding follower requests from deactivated accounts Closes #1771 See merge request pleroma/pleroma!2682
2020-06-25added wrapper Pleroma.HTTP for ExAws.S3Maksim Pechnikov
2020-06-24Filter outstanding follower requests from deactivated accountsMark Felder
2020-06-24StatusView: Add pleroma.parent_visiblelain
2020-06-24Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'lain
admin api status count per instance See merge request pleroma/pleroma!2500
2020-06-24Apply suggestion to test/http/tzdata_test.exslain
2020-06-24added wrapper Pleroma.HTTP for Tzdata.HTTPClientMaksim Pechnikov
2020-06-23Merge branch 'update-validator' into 'develop'lain
Update validator See merge request pleroma/pleroma!2668
2020-06-23Merge developRoman Chvanikov
2020-06-23Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'Haelwenn
Moving mrf settings from instance to separate mrf group Closes #1631 See merge request pleroma/pleroma!2320
2020-06-23migrate to oban 2.0-rc1Maksim Pechnikov
2020-06-23Merge branch 'issue/1798' into 'develop'lain
[#1798] fixed migration the settings to DB See merge request pleroma/pleroma!2655
2020-06-23ActivityPubControllerTest: Capture error loglain
2020-06-23ActivityPubControllerTest: Testing changes.lain
2020-06-23An act of desperation.lain
2020-06-23Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
update-validator
2020-06-23fix testsMaksim Pechnikov
2020-06-23added testsMaksim Pechnikov
2020-06-22Merge branch 'add-muted-to-notifications' into 'develop'lain
Add `pleroma.is_muted` property to notifications Closes #1812 See merge request pleroma/pleroma!2670
2020-06-22Add `is_muted` to notificationsEgor Kislitsyn
2020-06-22added verify RUM settings before start appMaksim Pechnikov
2020-06-22Merge branch 'feature/1739-account-endpoints' into 'develop'lain
account visibility in masto api Closes #1739 See merge request pleroma/pleroma!2488
2020-06-22Merge branch 'fix/1825-admin-api-error-codes' into 'develop'lain
Proper error codes for error in adminFE Closes #1825 See merge request pleroma/pleroma!2665
2020-06-22ActivityPub: Remove `update` and switch to pipeline.lain
2020-06-22Merge branch '1865-media-only' into 'develop'rinpatch
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned" Closes #1865 See merge request pleroma/pleroma!2650
2020-06-22Update Handling Test: Fix for re-used update ids.lain
2020-06-22SideEffects: Handle user updating.lain
2020-06-22Merge branch '1883-mrf-chat' into 'develop'rinpatch
HellthreadPolicy: Restrict to Notes and Articles. Closes #1883 See merge request pleroma/pleroma!2666
2020-06-22Merge branch 'feature/1854-emoji-pagination' into 'develop'lain
Emoji and packs pagination Closes #1854 See merge request pleroma/pleroma!2658