Commit Graph

9909 Commits (75e886b5065dd5ef6b7c99cbbe162f405e1b105e)
 

Author SHA1 Message Date
lain ab1154e13f Merge branch 'admin-logo-upload' into 'develop'
4 years ago
lain a42a0716ec Merge branch 'features/emoji_stealer' into 'develop'
4 years ago
lain f166316f50 Merge branch 'openapi/pleroma-api/pleroma' into 'develop'
4 years ago
lain 283fb1e05b Merge branch 'issue/749' into 'develop'
4 years ago
Egor Kislitsyn 45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController
4 years ago
lain bf1b221f94 Credo fixes for the credo god.
4 years ago
lain cdc6ba8d7b AnnounceValidator: Check for announcability
4 years ago
lain c76267afb9 Credo fixes.
4 years ago
lain 23e248694d Announcements: Fix all tests.
4 years ago
lain d9d425708e SideEffects: Builed out Announce effects.
4 years ago
lain 4ae2f75c3e Apply suggestion to docs/administration/CLI_tasks/user.md
4 years ago
Egor Kislitsyn 9de9760aa6
Move status actions to AdminAPI.StatusController
4 years ago
Maksim Pechnikov 9bc5e18ade rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
4 years ago
eugenijm b7fc61e17b Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE
4 years ago
Maksim Pechnikov c96f425cb0 fixed `mix pleroma.instance gen`
4 years ago
Haelwenn 42b06d78df Merge branch 'chore/update-config-fe' into 'develop'
4 years ago
Mark Felder 4c48626585 Also add new sidebarRight setting
4 years ago
lain 39031f4860 Pipeline: Don't federate if federation is disabled.
4 years ago
lain e42bc5f557 Announcements: Handle through common pipeline.
4 years ago
lain 265746b21f Merge branch 'openapi/pleroma-api/emojis' into 'develop'
4 years ago
lain c7cdc553ff Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
4 years ago
lain 423ea497bb Merge branch 'feature/1734-user-deletion' into 'develop'
4 years ago
lain 67844a8b11 Merge branch 'openapi/fix-spec' into 'develop'
4 years ago
lain eb5f428565 CommonAPI: Change public->private implicit addressing.
4 years ago
Egor Kislitsyn 26f01744bc
Add `background_image` to `InstanceOperation`
4 years ago
Egor Kislitsyn 5ba6e1c322
Move notification actions to PleromaAPI.NotificationController
4 years ago
Egor Kislitsyn f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController
4 years ago
Egor Kislitsyn 9a5de0f454
Move reaction actions to EmojiReactionController
4 years ago
Egor Kislitsyn 490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
4 years ago
Haelwenn 94ba5a7802 Merge branch 'exposed-background-image' into 'develop'
4 years ago
lain 6dd1575c64 Merge branch 'issue/1509' into 'develop'
4 years ago
lain 2a74565090 Changelog: Add background to instance
4 years ago
lain 5b8105928b Docs: Add background_image in instance
4 years ago
lain 8a6ddf26ac InstanceOperation: Add background image to example
4 years ago
lain c3cfe87c60 Merge branch 'mastofe/bundle-2020-05-20' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier c2dd4639d6
MastoFE: update to bundle-2020-05-20
4 years ago
Maksim 376147fb82 Apply suggestion to installation/nginx-cache-purge.sh.example
4 years ago
Haelwenn 5a149e5788 Merge branch 'openapi/pleroma-api/scrobble' into 'develop'
4 years ago
Maksim Pechnikov b5b9d161cd update purge script
4 years ago
Mark Felder 918ee46417 Synchronize :fe settings in config.exs
4 years ago
rinpatch 48bcb22146 Merge branch 'recipients-query-speedup' into 'develop'
4 years ago
Egor Kislitsyn 47ed9ee441
Fix summary
4 years ago
lain be322541c8 User.Query: Remove superfluous `distinct`
4 years ago
lain 2328eff09c UserTest: Hide warning in tests.
4 years ago
Egor Kislitsyn 6609714d66
Move Scrobble views to ScrobbleView
4 years ago
Egor Kislitsyn 524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController
4 years ago
lain a985bd57b4 User.Query: Speed up recipients query.
4 years ago
lain 7075fa92a5 Merge branch 'deps/update-crypt' into 'develop'
4 years ago
Roman Chvanikov 512261c97d Update crypt library
4 years ago
Egor Kislitsyn e4c720f14c
Fix typo
4 years ago