summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2020-05-21Ensure all MediaProxy settings are grouped togetherchore/expose-invalidation-to-adminfeMark Felder
2020-05-21Hint where to find the example scriptMark Felder
2020-05-21Add MediaProxy invalidation settings to description.exsMark Felder
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-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-20Merge branch 'openapi/pleroma-api/emojis' into 'develop'lain
2020-05-20Merge branch 'feature/1734-user-deletion' into 'develop'lain
2020-05-20Merge branch 'openapi/fix-spec' into 'develop'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
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
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
2020-05-19Update crypt libraryRoman Chvanikov
2020-05-19Fix typoEgor Kislitsyn
2020-05-19Merge branch 'openapi/pleroma-api/mascot' into 'develop'Haelwenn
2020-05-19Merge branch 'issue/1667' into 'develop'Haelwenn
2020-05-19Merge branch 'support/docs' into 'develop'Haelwenn
2020-05-19fix api/v1/accounts/update_credentialsMaksim Pechnikov
2020-05-19removed Quantum from docsMaksim Pechnikov
2020-05-19added testsMaksim Pechnikov
2020-05-18Fix API documentationEgor Kislitsyn