moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,862 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

9862 Commits

Author SHA1 Message Date
lain bcb549531f EmojiReactionController: Return more appropriate error. 2020-05-22 14:38:28 +02:00
Haelwenn 7b02bfca51 Merge branch 'announce-validator' into 'develop' 
Announce validator

See merge request pleroma/pleroma!2567
 2020-05-22 05:47:53 +00:00
Haelwenn a57e7f3503 Merge branch '1113-op-mentioning' into 'develop' 
CommonAPI: Change public->private implicit addressing.

Closes #1113

See merge request pleroma/pleroma!2563
 2020-05-22 05:22:07 +00:00
lain e0d1a942a6 Merge branch 'issue/1707' into 'develop' 
[#1707] fixed `mix pleroma.instance gen`

See merge request pleroma/pleroma!2565
 2020-05-21 14:32:49 +00:00
lain ab1154e13f Merge branch 'admin-logo-upload' into 'develop' 
Ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image

See merge request pleroma/pleroma!2388
 2020-05-21 14:30:34 +00:00
lain a42a0716ec Merge branch 'features/emoji_stealer' into 'develop' 
MRF.StealEmojiPolicy: New Policy

See merge request pleroma/pleroma!2385
 2020-05-21 13:31:49 +00:00
lain f166316f50 Merge branch 'openapi/pleroma-api/pleroma' into 'develop' 
Add OpenAPI spec for PleromaAPI.PleromaAPIController

See merge request pleroma/pleroma!2564
 2020-05-21 13:30:09 +00:00
lain 283fb1e05b Merge branch 'issue/749' into 'develop' 
[#749] unsubscribes of friends when user deactivated

See merge request pleroma/pleroma!2513
 2020-05-21 13:27:44 +00:00
Egor Kislitsyn 45d2c4157f
Add OpenAPI spec for AdminAPI.StatusController 2020-05-21 17:23:12 +04:00
lain bf1b221f94 Credo fixes for the credo god. 2020-05-21 14:12:32 +02:00
lain cdc6ba8d7b AnnounceValidator: Check for announcability 2020-05-21 13:58:18 +02:00
lain c76267afb9 Credo fixes. 2020-05-21 13:31:52 +02:00
lain 23e248694d Announcements: Fix all tests. 2020-05-21 13:16:21 +02:00
lain d9d425708e SideEffects: Builed out Announce effects. 2020-05-21 12:43:09 +02:00
lain 4ae2f75c3e Apply suggestion to docs/administration/CLI_tasks/user.md 2020-05-21 10:27:06 +00:00
Egor Kislitsyn 9de9760aa6
Move status actions to AdminAPI.StatusController 2020-05-21 13:52:30 +04:00
Maksim Pechnikov 9bc5e18ade rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate` 2020-05-21 08:06:57 +03:00
eugenijm b7fc61e17b Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE 2020-05-21 04:41:42 +03:00
Maksim Pechnikov c96f425cb0 fixed `mix pleroma.instance gen` 2020-05-20 21:30:41 +03:00
Haelwenn 42b06d78df Merge branch 'chore/update-config-fe' into 'develop' 
Synchronize :fe settings in config.exs

See merge request pleroma/pleroma!2560
 2020-05-20 17:45:19 +00:00
Mark Felder 4c48626585 Also add new sidebarRight setting 2020-05-20 12:22:31 -05:00
lain 39031f4860 Pipeline: Don't federate if federation is disabled. 2020-05-20 16:36:55 +02:00
lain e42bc5f557 Announcements: Handle through common pipeline. 2020-05-20 15:44:37 +02:00
lain 265746b21f Merge branch 'openapi/pleroma-api/emojis' into 'develop' 
Add OpenAPI spec for EmojiPackController

See merge request pleroma/pleroma!2549
 2020-05-20 12:08:28 +00:00
lain c7cdc553ff Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator 2020-05-20 14:02:40 +02:00
lain 423ea497bb Merge branch 'feature/1734-user-deletion' into 'develop' 
User deletion

Closes #1734

See merge request pleroma/pleroma!2493
 2020-05-20 11:43:49 +00:00
lain 67844a8b11 Merge branch 'openapi/fix-spec' into 'develop' 
Add `background_image` to `InstanceOperation`

See merge request pleroma/pleroma!2562
 2020-05-20 11:40:05 +00:00
lain eb5f428565 CommonAPI: Change public->private implicit addressing. 
This will not add the OP to the `to` field anymore when going from
public to private.
 2020-05-20 13:38:47 +02:00
Egor Kislitsyn 26f01744bc
Add `background_image` to `InstanceOperation` 2020-05-20 15:18:58 +04:00
Egor Kislitsyn 5ba6e1c322
Move notification actions to PleromaAPI.NotificationController 2020-05-20 15:15:13 +04:00
Egor Kislitsyn f3fc8b22b1
Move conversation actions to PleromaAPI.ConversationController 2020-05-20 15:15:13 +04:00
Egor Kislitsyn 9a5de0f454
Move reaction actions to EmojiReactionController 2020-05-20 15:15:13 +04:00
Egor Kislitsyn 490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController 2020-05-20 15:15:13 +04:00
Haelwenn 94ba5a7802 Merge branch 'exposed-background-image' into 'develop' 
InstanceView: Expose background image link.

See merge request pleroma/pleroma!2545
 2020-05-20 10:53:54 +00:00
lain 6dd1575c64 Merge branch 'issue/1509' into 'develop' 
[#1509]  purge media from cache after delete

See merge request pleroma/pleroma!2539
 2020-05-20 10:35:36 +00:00
lain 2a74565090 Changelog: Add background to instance 2020-05-20 12:14:17 +02:00
lain 5b8105928b Docs: Add background_image in instance 2020-05-20 12:13:57 +02:00
lain 8a6ddf26ac InstanceOperation: Add background image to example 2020-05-20 12:12:07 +02:00
lain c3cfe87c60 Merge branch 'mastofe/bundle-2020-05-20' into 'develop' 
MastoFE: update to bundle-2020-05-20

See merge request pleroma/pleroma!2561
 2020-05-20 09:12:35 +00:00
Haelwenn (lanodan) Monnier c2dd4639d6
MastoFE: update to bundle-2020-05-20 2020-05-20 07:55:14 +02:00
Maksim 376147fb82 Apply suggestion to installation/nginx-cache-purge.sh.example 2020-05-20 04:12:21 +00:00
Haelwenn 5a149e5788 Merge branch 'openapi/pleroma-api/scrobble' into 'develop' 
Add OpenAPI spec for PleromaAPI.ScrobbleController

See merge request pleroma/pleroma!2559
 2020-05-20 04:00:46 +00:00
Maksim Pechnikov b5b9d161cd update purge script 2020-05-20 06:56:04 +03:00
Mark Felder 918ee46417 Synchronize :fe settings in config.exs 2020-05-19 16:05:39 -05:00
rinpatch 48bcb22146 Merge branch 'recipients-query-speedup' into 'develop' 
Greatly speed up recipients query

See merge request pleroma/pleroma!2558
 2020-05-19 14:32:27 +00:00
Egor Kislitsyn 47ed9ee441
Fix summary 2020-05-19 17:29:58 +04:00
lain be322541c8 User.Query: Remove superfluous `distinct` 2020-05-19 14:36:34 +02:00
lain 2328eff09c UserTest: Hide warning in tests. 2020-05-19 14:36:13 +02:00
Egor Kislitsyn 6609714d66
Move Scrobble views to ScrobbleView 2020-05-19 16:26:06 +04:00
Egor Kislitsyn 524d04d921
Add OpenAPI spec for PleromaAPI.ScrobbleController 2020-05-19 16:26:06 +04:00