aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-07-02Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview...Ivan Tashkinov
2020-07-02Merge branch 'fetcher-fixes' into 'develop'rinpatch
2020-07-02Merge branch '1907-fix-announce-streaming' into 'develop'rinpatch
2020-07-02Merge branch 'feature/update-description' into 'develop'lain
2020-07-02Credo fixes.lain
2020-07-02Changelog: Update with stream changes.lain
2020-07-02Streamer: Align announce streaming with polling.lain
2020-07-02SideEffects: Refactor.lain
2020-07-01Merge branch '1716-handle-nickname-clashes' into 'develop'rinpatch
2020-07-01ActivityPub: Handle clashing nicknames for the same ap idlain
2020-07-01Fetcher: Work when we can't get the OP.lain
2020-07-01Fixtures: Pretty print.lain
2020-07-01Merge branch 'revert-651f2695' into 'develop'lain
2020-07-01Revert "Merge branch 'avatar-removing' into 'develop'"lain
2020-07-01Add labels, update descriptions and labelsAngelina Filippova
2020-06-30Merge branch 'chore/rename-user-settings-column' into 'develop'Haelwenn
2020-06-30Rename user.settings columnMark Felder
2020-06-30Merge branch 'preloadfixups' into 'develop'lain
2020-06-30Credo fixeslain
2020-06-30Merge branch 'preload-fixups-2' into preloadfixupslain
2020-06-30Preload: Load the correct instance panellain
2020-06-30Merge branch 'patch-1' into 'develop'lain
2020-06-30Use correct PostgreSQL version command in bug templatenormandy
2020-06-29Merge branch 'fix-notification-filtering' into 'develop'rinpatch
2020-06-29Apply suggestion to lib/pleroma/notification.exlain
2020-06-29Merge branch 'fix/cast-and-validate' into 'develop'lain
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
2020-06-29Fix CastAndValidate plugEgor Kislitsyn
2020-06-29updated swooshMaksim Pechnikov
2020-06-29Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'lain
2020-06-29excluding attachment links from RichMediaAlexander Strizhakov
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-29Merge branch 'openapi/schema-account-pleromafields' into 'develop'lain
2020-06-29ApiSpec.Schemas.Account: import description from differences_in_mastoapi_resp...Haelwenn (lanodan) Monnier
2020-06-29Merge branch 'docs/mastoapi-account-fields' into 'develop'Haelwenn
2020-06-29differences_in_mastoapi_responses: Update account fieldsHaelwenn (lanodan) Monnier
2020-06-27Merge branch 'reduce-preloading-defaults' into 'develop'lain
2020-06-27Config: Reduce default preloaders to configuration endpoints.lain
2020-06-27Merge branch 'fix/fetcher-transmogrifier-error' into 'develop'lain
2020-06-26object/fetcher: Pass full Transmogrifier errorHaelwenn (lanodan) Monnier
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