summaryrefslogtreecommitdiff
path: root/test/web
AgeCommit message (Expand)Author
2020-06-30Rename user.settings columnMark Felder
2020-06-30Merge branch 'preload-fixups-2' into preloadfixupslain
2020-06-30Preload: Load the correct instance panellain
2020-06-29Test default "content-type" for CastAndValidateEgor Kislitsyn
2020-06-29Merge branch 'avatar-removing' into 'develop'lain
2020-06-29UpdateCredentialsTest: Add test for removing profile images.lain
2020-06-29Preloaders: Use strings as keys.lain
2020-06-29User preloader: Put user info at correct keylain
2020-06-29Merge branch '1031-parent-visible' into 'develop'lain
2020-06-26Merge branch 'block-handling' into 'develop'Haelwenn
2020-06-26Merge branch '1258-anti-link-spam-exemption' into 'develop'Haelwenn
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-25Merge branch 'preload-data' into 'develop'feld
2020-06-25AntiSpamLinkPolicy: Exempt local users.lain
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-24StatusView: Add pleroma.parent_visiblelain
2020-06-24Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'lain
2020-06-23Merge branch 'update-validator' into 'develop'lain
2020-06-23Merge developRoman Chvanikov
2020-06-23Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'Haelwenn
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 update-vali...lain
2020-06-22Merge branch 'add-muted-to-notifications' into 'develop'lain
2020-06-22Add `is_muted` to notificationsEgor Kislitsyn
2020-06-22Merge branch 'feature/1739-account-endpoints' into 'develop'lain
2020-06-22Merge branch 'fix/1825-admin-api-error-codes' into 'develop'lain
2020-06-22ActivityPub: Remove `update` and switch to pipeline.lain
2020-06-22Merge branch '1865-media-only' into 'develop'rinpatch
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
2020-06-22Merge branch 'feature/1854-emoji-pagination' into 'develop'lain
2020-06-22HellthreadPolicy: Restrict to Notes and Articles.lain
2020-06-20proper error codes for error in adminFEAlexander Strizhakov
2020-06-20Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop'lain
2020-06-20Merge branch 'develop' into '1865-media-only'lain
2020-06-20fix for packs paginationAlexander Strizhakov
2020-06-20Stop filling conversation field on incoming objects (legacy, unused)Haelwenn (lanodan) Monnier
2020-06-19Merge branch 'issue/1855' into 'develop'feld
2020-06-19Add support for bot field in update_credentialsSergey Suprunenko