aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Expand)Author
2020-06-30Add fields limits to instance metadata, add testsMark Felder
2020-06-30Merge branch 'develop' into activation-metaMark Felder
2020-06-30Rename user.settings columnMark Felder
2020-06-30Credo fixeslain
2020-06-30Merge branch 'preload-fixups-2' into preloadfixupslain
2020-06-30Preload: Load the correct instance panellain
2020-06-29Fix CastAndValidate plugEgor Kislitsyn
2020-06-29Remove `/statusnet/config`Egor Kislitsyn
2020-06-29Fix warningEgor Kislitsyn
2020-06-29Merge branch 'develop' into remove-twitter-apiEgor Kislitsyn
2020-06-29Credo fixes.lain
2020-06-29Token Response: Remove empty file.lain
2020-06-29AccountOperation: Correctly describe create response.lain
2020-06-29OAuth: Extract view-type functions to a view.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-29ApiSpec.Schemas.Account: import description from differences_in_mastoapi_resp...Haelwenn (lanodan) Monnier
2020-06-26MastoAPI: Show source field when deletingHaelwenn (lanodan) Monnier
2020-06-26Rename notification "privacy_option" settingMark Felder
2020-06-26Merge branch 'block-handling' into 'develop'Haelwenn
2020-06-26Merge branch '1258-anti-link-spam-exemption' into 'develop'Haelwenn
2020-06-26Simplify notification filtering settings furtherMark Felder
2020-06-26Merge branch 'develop' into refactor/notification_settingsMark Felder
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-26nodeinfo: Fix MRF transparencyHaelwenn (lanodan) Monnier
2020-06-25Merge branch 'preload-data' into 'develop'feld
2020-06-25Merge branch 'develop' into refactor/notification_settingsMark Felder
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-25AccountController: Extract blocking to CommonAPI.lain
2020-06-25Transmogrifier: Switch to pipeline for Blocks.lain
2020-06-25ObjectValidator: Basic `Block` support.lain
2020-06-24Status schema: Add parent_visible.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-23ObjectValidator: Clarify type of object.lain
2020-06-23Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-vali...lain
2020-06-23ActivityPubController: Update upload_media @docHaelwenn (lanodan) Monnier
2020-06-23Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'Haelwenn