summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-05-22Revert "Merge branch 'issue/1509' into 'develop'"revert-6dd1575clain
2020-05-22Merge branch 'priv-warning' into 'develop'lain
2020-05-22Merge branch 'feature/configure-filename-truncate' into 'develop'lain
2020-05-22Apply suggestion to lib/pleroma/web/common_api/utils.exRoman Chvanikov
2020-05-22Update CHANGELOG and docsRoman Chvanikov
2020-05-22Add filename_display_max_length configRoman Chvanikov
2020-05-22Merge branch 'emoji-react-better-errors' into 'develop'rinpatch
2020-05-22Merge branch 'fix/notifications-api' into 'develop'rinpatch
2020-05-22priv/static: Add a warning discouraging admins from modifying the static file...rinpatch
2020-05-22Fix notifications mark as read APIEgor Kislitsyn
2020-05-22EmojiReactionController: Return more appropriate error.lain
2020-05-22Merge branch 'announce-validator' into 'develop'Haelwenn
2020-05-22Merge branch '1113-op-mentioning' into 'develop'Haelwenn
2020-05-21Merge branch 'issue/1707' into 'develop'lain
2020-05-21Merge branch 'admin-logo-upload' into 'develop'lain
2020-05-21Merge branch 'features/emoji_stealer' into 'develop'lain
2020-05-21Merge branch 'openapi/pleroma-api/pleroma' into 'develop'lain
2020-05-21Merge branch 'issue/749' into 'develop'lain
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-21rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`Maksim Pechnikov
2020-05-21Added the ability to upload background, logo, default user avatar, instance t...eugenijm
2020-05-20fixed `mix pleroma.instance gen`Maksim Pechnikov
2020-05-20Merge branch 'chore/update-config-fe' into 'develop'Haelwenn
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
2020-05-20Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-va...lain
2020-05-20Merge branch 'feature/1734-user-deletion' into 'develop'lain
2020-05-20Merge branch 'openapi/fix-spec' into 'develop'lain
2020-05-20CommonAPI: Change public->private implicit addressing.lain
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
2020-05-20Merge branch 'issue/1509' into 'develop'lain
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
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
generated by cgit v1.2.3 (git 2.44.0) at 2024-04-26 02:51:28 +0000