summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-30Merge branch 'patch-1' into 'develop'lain
Use correct PostgreSQL version command in bug template See merge request pleroma/pleroma!2706
2020-06-30Use correct PostgreSQL version command in bug templatenormandy
2020-06-29Merge branch 'fix-notification-filtering' into 'develop'rinpatch
Notifications: Never return `nil` in the notification list. See merge request pleroma/pleroma!2705
2020-06-29Apply suggestion to lib/pleroma/notification.exlain
2020-06-29Merge branch 'fix/cast-and-validate' into 'develop'lain
Fix CastAndValidate plug Closes #1889 See merge request pleroma/pleroma!2704
2020-06-29Notification: Remove TODO.lain
2020-06-29Notifications: Never return `nil` in the notification list.lain
2020-06-29Test default "content-type" for CastAndValidateEgor Kislitsyn
2020-06-29Merge branch 'fix/swoosh-sendmail' into 'develop'feld
updated swoosh See merge request pleroma/pleroma!2703
2020-06-29Fix CastAndValidate plugEgor Kislitsyn
2020-06-29updated swooshMaksim Pechnikov
2020-06-29Remove `/statusnet/config`Egor Kislitsyn
2020-06-29Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'lain
excluding attachment links from RichMedia See merge request pleroma/pleroma!2702
2020-06-29Fix warningEgor Kislitsyn
2020-06-29excluding attachment links from RichMediaAlexander Strizhakov
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-29Merge branch 'avatar-removing' into 'develop'lain
UpdateCredentialsTest: Add test for removing profile images. See merge request pleroma/pleroma!2701
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
Resolve "Add `pleroma.parent_visible` to the status view" Closes #1031 See merge request pleroma/pleroma!2679
2020-06-29Merge branch 'openapi/schema-account-pleromafields' into 'develop'lain
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses See merge request pleroma/pleroma!2700
2020-06-29ApiSpec.Schemas.Account: import description from ↵Haelwenn (lanodan) Monnier
differences_in_mastoapi_responses
2020-06-29Merge branch 'docs/mastoapi-account-fields' into 'develop'Haelwenn
differences_in_mastoapi_responses: Update account fields See merge request pleroma/pleroma!2699
2020-06-29differences_in_mastoapi_responses: Update account fieldsHaelwenn (lanodan) Monnier
2020-06-27Merge branch 'reduce-preloading-defaults' into 'develop'lain
Config: Reduce default preloaders to configuration endpoints. See merge request pleroma/pleroma!2697
2020-06-27Config: Reduce default preloaders to configuration endpoints.lain
Fetching the timeline is a bit heavy to do by default.
2020-06-27Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'lain
object/fetcher: Pass full Transmogrifier error See merge request pleroma/pleroma!2696
2020-06-27added tab & labels for mrf policiesAlexander Strizhakov
2020-06-26LintMark Felder
2020-06-26object/fetcher: Pass full Transmogrifier errorHaelwenn (lanodan) Monnier
2020-06-26MastoAPI: Show source field when deletingHaelwenn (lanodan) Monnier
2020-06-26Document breaking change of hide_notification_details settingMark Felder
2020-06-26Rename notification "privacy_option" settingMark Felder
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-26additional data to MRF policies in descriptionsAlexander Strizhakov
2020-06-26Merge branch 'fix-chats' into 'develop'lain
Nodeinfo: Add chat information back in. See merge request pleroma/pleroma!2691
2020-06-26Nodeinfo: Add chat information back in.lain
2020-06-26User: Don't unfollow on block when the relevant setting is set.lain