aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-01Revert "Merge branch 'avatar-removing' into 'develop'"lain
This reverts merge request !2701
2020-07-01Add labels, update descriptions and labelsAngelina Filippova
2020-06-30Merge branch 'chore/rename-user-settings-column' into 'develop'Haelwenn
Rename user.settings column See merge request pleroma/pleroma!2707
2020-06-30Add fields limits to instance metadata, add testsMark Felder
2020-06-30Merge branch 'develop' into activation-metaMark Felder
2020-06-30[#1892] Excluded bot actors (applications, services) from search results.Ivan Tashkinov
2020-06-30Rename user.settings columnMark Felder
This is used exclusively by MastoFE/GlitchFE now
2020-06-30Merge branch 'preloadfixups' into 'develop'lain
Some fixups for the preload. See merge request pleroma/pleroma!2692
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
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-29Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop'lain
excluding attachment links from RichMedia See merge request pleroma/pleroma!2702
2020-06-29excluding attachment links from RichMediaAlexander Strizhakov
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-26object/fetcher: Pass full Transmogrifier errorHaelwenn (lanodan) Monnier
2020-06-26MastoAPI: Show source field when deletingHaelwenn (lanodan) Monnier
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-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
2020-06-26BlockValidator: Restore old behavior for incoming blocks.lain
2020-06-26Pleroma.Upload.Filter.Mogrify args descriptionAlexander Strizhakov
2020-06-26activity_draft: Add source fieldHaelwenn (lanodan) Monnier
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 01:28:56 +0000