summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-21Merge branch 'admin-logo-upload' into 'develop'lain
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image See merge request pleroma/pleroma!2388
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-21Add OpenAPI spec for AdminAPI.StatusControllerEgor Kislitsyn
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-21Credo fixes for the credo god.lain
2020-05-21AnnounceValidator: Check for announcabilitylain
2020-05-21Credo fixes.lain
2020-05-21Announcements: Fix all tests.lain
2020-05-21SideEffects: Builed out Announce effects.lain
2020-05-21Apply suggestion to docs/administration/CLI_tasks/user.mdlain
2020-05-21Move status actions to AdminAPI.StatusControllerEgor Kislitsyn
2020-05-21rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`Maksim Pechnikov
2020-05-21Added the ability to upload background, logo, default user avatar, instance ↵eugenijm
thumbnail, and the NSFW hiding image via AdminFE
2020-05-20fixed `mix pleroma.instance gen`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-20Pipeline: Don't federate if federation is disabled.lain
2020-05-20Announcements: Handle through common pipeline.lain
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 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
announce-validator
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-20CommonAPI: Change public->private implicit addressing.lain
This will not add the OP to the `to` field anymore when going from public to private.
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 23:46:39 +0000