summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-21Merge branch 'features/emoji_stealer' into 'develop'lain
MRF.StealEmojiPolicy: New Policy See merge request pleroma/pleroma!2385
2020-05-21Merge branch 'openapi/pleroma-api/pleroma' into 'develop'lain
Add OpenAPI spec for PleromaAPI.PleromaAPIController See merge request pleroma/pleroma!2564
2020-05-21Merge branch 'issue/749' into 'develop'lain
[#749] unsubscribes of friends when user deactivated See merge request pleroma/pleroma!2513
2020-05-21UploadTest: Fix test.lain
2020-05-21Attachments: Have the mediaType on the root, too.lain
2020-05-21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
remake-remodel-dms
2020-05-21Apply suggestion to docs/administration/CLI_tasks/user.mdlain
2020-05-21rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`Maksim Pechnikov
2020-05-20Merge branch 'chore/update-config-fe' into 'develop'Haelwenn
Synchronize :fe settings in config.exs See merge request pleroma/pleroma!2560
2020-05-20Also add new sidebarRight settingMark Felder
2020-05-20Merge branch 'openapi/pleroma-api/emojis' into 'develop'lain
Add OpenAPI spec for EmojiPackController See merge request pleroma/pleroma!2549
2020-05-20Merge branch 'feature/1734-user-deletion' into 'develop'lain
User deletion Closes #1734 See merge request pleroma/pleroma!2493
2020-05-20Merge branch 'openapi/fix-spec' into 'develop'lain
Add `background_image` to `InstanceOperation` See merge request pleroma/pleroma!2562
2020-05-20Add `background_image` to `InstanceOperation`Egor Kislitsyn
2020-05-20Move notification actions to PleromaAPI.NotificationControllerEgor Kislitsyn
2020-05-20Move conversation actions to PleromaAPI.ConversationControllerEgor Kislitsyn
2020-05-20Move reaction actions to EmojiReactionControllerEgor Kislitsyn
2020-05-20Add OpenAPI spec for PleromaAPI.PleromaAPIControllerEgor Kislitsyn
2020-05-20Merge branch 'exposed-background-image' into 'develop'Haelwenn
InstanceView: Expose background image link. See merge request pleroma/pleroma!2545
2020-05-20Merge branch 'issue/1509' into 'develop'lain
[#1509] purge media from cache after delete See merge request pleroma/pleroma!2539
2020-05-20Changelog: Add background to instancelain
2020-05-20Docs: Add background_image in instancelain
2020-05-20InstanceOperation: Add background image to examplelain
2020-05-20Merge branch 'mastofe/bundle-2020-05-20' into 'develop'lain
MastoFE: update to bundle-2020-05-20 See merge request pleroma/pleroma!2561
2020-05-20MastoFE: update to bundle-2020-05-20Haelwenn (lanodan) Monnier
2020-05-20Apply suggestion to installation/nginx-cache-purge.sh.exampleMaksim
2020-05-20Merge branch 'openapi/pleroma-api/scrobble' into 'develop'Haelwenn
Add OpenAPI spec for PleromaAPI.ScrobbleController See merge request pleroma/pleroma!2559
2020-05-20update purge scriptMaksim Pechnikov
2020-05-19Synchronize :fe settings in config.exsMark Felder
2020-05-19Merge branch 'recipients-query-speedup' into 'develop'rinpatch
Greatly speed up recipients query See merge request pleroma/pleroma!2558
2020-05-19Fix summaryEgor Kislitsyn
2020-05-19User.Query: Remove superfluous `distinct`lain
2020-05-19UserTest: Hide warning in tests.lain
2020-05-19Move Scrobble views to ScrobbleViewEgor Kislitsyn
2020-05-19Add OpenAPI spec for PleromaAPI.ScrobbleControllerEgor Kislitsyn
2020-05-19User.Query: Speed up recipients query.lain
2020-05-19Merge branch 'deps/update-crypt' into 'develop'lain
Update crypt library See merge request pleroma/pleroma!2557
2020-05-19Update crypt libraryRoman Chvanikov
2020-05-19Fix typoEgor Kislitsyn
2020-05-19Merge branch 'openapi/pleroma-api/mascot' into 'develop'Haelwenn
Add OpenAPI spec for MascotController See merge request pleroma/pleroma!2553
2020-05-19Merge branch 'issue/1667' into 'develop'Haelwenn
[#1667] fix api/v1/accounts/update_credentials See merge request pleroma/pleroma!2556
2020-05-19Merge branch 'support/docs' into 'develop'Haelwenn
fix docs See merge request pleroma/pleroma!2555
2020-05-19fix api/v1/accounts/update_credentialsMaksim Pechnikov
2020-05-19removed Quantum from docsMaksim Pechnikov
2020-05-19added testsMaksim Pechnikov
2020-05-18AttachmentValidator: Handle empty mediatypeslain
2020-05-18Fix API documentationEgor Kislitsyn
2020-05-18Add OpenAPI spec for MascotControllerEgor Kislitsyn
2020-05-18Merge branch 'openapi/use-boolean-like-in-requests' into 'develop'rinpatch
[OpenAPI] Use BooleanLike in all request bodies Closes #1782 See merge request pleroma/pleroma!2551
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 07:16:06 +0000