akkoma
4 years agoStealEmojiPolicyTest: Clean up.
lain [Mon, 25 May 2020 12:00:18 +0000 (14:00 +0200)]
StealEmojiPolicyTest: Clean up.

4 years agoStealEmojiPolicyTest: Fix flaky test.
lain [Mon, 25 May 2020 11:48:47 +0000 (13:48 +0200)]
StealEmojiPolicyTest: Fix flaky test.

4 years agoMerge branch 'openapi/admin/status' into 'develop'
lain [Mon, 25 May 2020 11:40:54 +0000 (11:40 +0000)]
Merge branch 'openapi/admin/status' into 'develop'

Add OpenAPI spec for AdminAPI.StatusController

See merge request pleroma/pleroma!2566

4 years agoMerge branch 'mastodon-migration-compat' into 'develop'
rinpatch [Sun, 24 May 2020 19:05:57 +0000 (19:05 +0000)]
Merge branch 'mastodon-migration-compat' into 'develop'

Add compatibility routes for converted mastodon instances

Closes #1797

See merge request pleroma/pleroma!2572

4 years agoMerge branch 'priv-warning' into 'develop'
lain [Fri, 22 May 2020 17:20:23 +0000 (17:20 +0000)]
Merge branch 'priv-warning' into 'develop'

priv/static: Add a warning discouraging admins from modifying the static files directly

See merge request pleroma/pleroma!2571

4 years agoMerge branch 'feature/configure-filename-truncate' into 'develop'
lain [Fri, 22 May 2020 16:05:35 +0000 (16:05 +0000)]
Merge branch 'feature/configure-filename-truncate' into 'develop'

Configurable filename truncation threshold

Closes #1799

See merge request pleroma/pleroma!2573

4 years agoApply suggestion to lib/pleroma/web/common_api/utils.ex
Roman Chvanikov [Fri, 22 May 2020 15:44:10 +0000 (15:44 +0000)]
Apply suggestion to lib/pleroma/web/common_api/utils.ex

4 years agoUpdate CHANGELOG and docs
Roman Chvanikov [Fri, 22 May 2020 15:30:13 +0000 (18:30 +0300)]
Update CHANGELOG and docs

4 years agoAdd filename_display_max_length config
Roman Chvanikov [Fri, 22 May 2020 15:19:25 +0000 (18:19 +0300)]
Add filename_display_max_length config

4 years agoAdd Changelog
lain [Fri, 22 May 2020 15:13:09 +0000 (17:13 +0200)]
Add Changelog

4 years agoOStatusController: Add Mastodon activity compat route.
lain [Fri, 22 May 2020 15:11:59 +0000 (17:11 +0200)]
OStatusController: Add Mastodon activity compat route.

4 years agoActivityPubController: Add Mastodon activity compat route.
lain [Fri, 22 May 2020 15:06:12 +0000 (17:06 +0200)]
ActivityPubController: Add Mastodon activity compat route.

4 years agoOStatusController: Add Mastodon compatibility route for objects.
lain [Fri, 22 May 2020 14:47:22 +0000 (16:47 +0200)]
OStatusController: Add Mastodon compatibility route for objects.

4 years agoMerge branch 'emoji-react-better-errors' into 'develop'
rinpatch [Fri, 22 May 2020 14:36:08 +0000 (14:36 +0000)]
Merge branch 'emoji-react-better-errors' into 'develop'

EmojiReactionController: Return more appropriate error.

See merge request pleroma/pleroma!2569

4 years agoMerge branch 'fix/notifications-api' into 'develop'
rinpatch [Fri, 22 May 2020 14:35:13 +0000 (14:35 +0000)]
Merge branch 'fix/notifications-api' into 'develop'

Fix notifications mark as read API

Closes #1800

See merge request pleroma/pleroma!2570

4 years agopriv/static: Add a warning discouraging admins from modifying the static files directly
rinpatch [Fri, 22 May 2020 14:33:19 +0000 (17:33 +0300)]
priv/static: Add a warning discouraging admins from modifying the static files directly

4 years agoFix notifications mark as read API
Egor Kislitsyn [Fri, 22 May 2020 14:15:36 +0000 (18:15 +0400)]
Fix notifications mark as read API

4 years agoActivityPubController: Add Mastodon compatibility route.
lain [Fri, 22 May 2020 14:15:29 +0000 (16:15 +0200)]
ActivityPubController: Add Mastodon compatibility route.

4 years agoEmojiReactionController: Return more appropriate error.
lain [Fri, 22 May 2020 12:38:28 +0000 (14:38 +0200)]
EmojiReactionController: Return more appropriate error.

4 years agoMerge branch 'announce-validator' into 'develop'
Haelwenn [Fri, 22 May 2020 05:47:53 +0000 (05:47 +0000)]
Merge branch 'announce-validator' into 'develop'

Announce validator

See merge request pleroma/pleroma!2567

4 years agoMerge branch '1113-op-mentioning' into 'develop'
Haelwenn [Fri, 22 May 2020 05:22:07 +0000 (05:22 +0000)]
Merge branch '1113-op-mentioning' into 'develop'

CommonAPI: Change public->private implicit addressing.

Closes #1113

See merge request pleroma/pleroma!2563

4 years agoMerge branch 'issue/1707' into 'develop'
lain [Thu, 21 May 2020 14:32:49 +0000 (14:32 +0000)]
Merge branch 'issue/1707' into 'develop'

[#1707] fixed `mix pleroma.instance gen`

See merge request pleroma/pleroma!2565

4 years agoMerge branch 'admin-logo-upload' into 'develop'
lain [Thu, 21 May 2020 14:30:34 +0000 (14:30 +0000)]
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

4 years agoMerge branch 'features/emoji_stealer' into 'develop'
lain [Thu, 21 May 2020 13:31:49 +0000 (13:31 +0000)]
Merge branch 'features/emoji_stealer' into 'develop'

MRF.StealEmojiPolicy: New Policy

See merge request pleroma/pleroma!2385

4 years agoMerge branch 'openapi/pleroma-api/pleroma' into 'develop'
lain [Thu, 21 May 2020 13:30:09 +0000 (13:30 +0000)]
Merge branch 'openapi/pleroma-api/pleroma' into 'develop'

Add OpenAPI spec for PleromaAPI.PleromaAPIController

See merge request pleroma/pleroma!2564

4 years agoMerge branch 'issue/749' into 'develop'
lain [Thu, 21 May 2020 13:27:44 +0000 (13:27 +0000)]
Merge branch 'issue/749' into 'develop'

[#749] unsubscribes of friends when user deactivated

See merge request pleroma/pleroma!2513

4 years agoAdd OpenAPI spec for AdminAPI.StatusController
Egor Kislitsyn [Thu, 21 May 2020 10:03:38 +0000 (14:03 +0400)]
Add OpenAPI spec for AdminAPI.StatusController

4 years agoCredo fixes for the credo god.
lain [Thu, 21 May 2020 12:12:32 +0000 (14:12 +0200)]
Credo fixes for the credo god.

4 years agoAnnounceValidator: Check for announcability
lain [Thu, 21 May 2020 11:58:18 +0000 (13:58 +0200)]
AnnounceValidator: Check for announcability

4 years agoCredo fixes.
lain [Thu, 21 May 2020 11:31:52 +0000 (13:31 +0200)]
Credo fixes.

4 years agoAnnouncements: Fix all tests.
lain [Thu, 21 May 2020 11:16:21 +0000 (13:16 +0200)]
Announcements: Fix all tests.

4 years agoSideEffects: Builed out Announce effects.
lain [Thu, 21 May 2020 10:43:09 +0000 (12:43 +0200)]
SideEffects: Builed out Announce effects.

4 years agoApply suggestion to docs/administration/CLI_tasks/user.md
lain [Thu, 21 May 2020 10:27:06 +0000 (10:27 +0000)]
Apply suggestion to docs/administration/CLI_tasks/user.md

4 years agoMove status actions to AdminAPI.StatusController
Egor Kislitsyn [Wed, 20 May 2020 14:00:41 +0000 (18:00 +0400)]
Move status actions to AdminAPI.StatusController

4 years agorename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`
Maksim Pechnikov [Thu, 21 May 2020 05:06:57 +0000 (08:06 +0300)]
rename mix task: `pleroma.user unsubscribe` -> `pleroma.user deactivate`

4 years agoAdded the ability to upload background, logo, default user avatar, instance thumbnail...
eugenijm [Sun, 12 Apr 2020 19:54:43 +0000 (22:54 +0300)]
Added the ability to upload background, logo, default user avatar, instance thumbnail, and the NSFW hiding image via AdminFE

4 years agofixed `mix pleroma.instance gen`
Maksim Pechnikov [Wed, 20 May 2020 18:16:40 +0000 (21:16 +0300)]
fixed `mix pleroma.instance gen`

4 years agoMerge branch 'chore/update-config-fe' into 'develop'
Haelwenn [Wed, 20 May 2020 17:45:19 +0000 (17:45 +0000)]
Merge branch 'chore/update-config-fe' into 'develop'

Synchronize :fe settings in config.exs

See merge request pleroma/pleroma!2560

4 years agoAlso add new sidebarRight setting
Mark Felder [Wed, 20 May 2020 17:22:31 +0000 (12:22 -0500)]
Also add new sidebarRight setting

4 years agoPipeline: Don't federate if federation is disabled.
lain [Wed, 20 May 2020 14:36:55 +0000 (16:36 +0200)]
Pipeline: Don't federate if federation is disabled.

4 years agoAnnouncements: Handle through common pipeline.
lain [Wed, 20 May 2020 13:44:37 +0000 (15:44 +0200)]
Announcements: Handle through common pipeline.

4 years agoMerge branch 'openapi/pleroma-api/emojis' into 'develop'
lain [Wed, 20 May 2020 12:08:28 +0000 (12:08 +0000)]
Merge branch 'openapi/pleroma-api/emojis' into 'develop'

Add OpenAPI spec for EmojiPackController

See merge request pleroma/pleroma!2549

4 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator
lain [Wed, 20 May 2020 12:02:40 +0000 (14:02 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator

4 years agoMerge branch 'feature/1734-user-deletion' into 'develop'
lain [Wed, 20 May 2020 11:43:49 +0000 (11:43 +0000)]
Merge branch 'feature/1734-user-deletion' into 'develop'

User deletion

Closes #1734

See merge request pleroma/pleroma!2493

4 years agoMerge branch 'openapi/fix-spec' into 'develop'
lain [Wed, 20 May 2020 11:40:05 +0000 (11:40 +0000)]
Merge branch 'openapi/fix-spec' into 'develop'

Add `background_image` to `InstanceOperation`

See merge request pleroma/pleroma!2562

4 years agoCommonAPI: Change public->private implicit addressing.
lain [Wed, 20 May 2020 11:38:47 +0000 (13:38 +0200)]
CommonAPI: Change public->private implicit addressing.

This will not add the OP to the `to` field anymore when going from
public to private.

4 years agoAdd `background_image` to `InstanceOperation`
Egor Kislitsyn [Wed, 20 May 2020 11:18:58 +0000 (15:18 +0400)]
Add `background_image` to `InstanceOperation`

4 years agoMove notification actions to PleromaAPI.NotificationController
Egor Kislitsyn [Wed, 20 May 2020 11:14:11 +0000 (15:14 +0400)]
Move notification actions to PleromaAPI.NotificationController

4 years agoMove conversation actions to PleromaAPI.ConversationController
Egor Kislitsyn [Wed, 20 May 2020 11:00:11 +0000 (15:00 +0400)]
Move conversation actions to PleromaAPI.ConversationController

4 years agoMove reaction actions to EmojiReactionController
Egor Kislitsyn [Tue, 19 May 2020 19:50:49 +0000 (23:50 +0400)]
Move reaction actions to EmojiReactionController

4 years agoAdd OpenAPI spec for PleromaAPI.PleromaAPIController
Egor Kislitsyn [Tue, 19 May 2020 17:52:26 +0000 (21:52 +0400)]
Add OpenAPI spec for PleromaAPI.PleromaAPIController

4 years agoMerge branch 'exposed-background-image' into 'develop'
Haelwenn [Wed, 20 May 2020 10:53:54 +0000 (10:53 +0000)]
Merge branch 'exposed-background-image' into 'develop'

InstanceView: Expose background image link.

See merge request pleroma/pleroma!2545

4 years agoMerge branch 'issue/1509' into 'develop'
lain [Wed, 20 May 2020 10:35:36 +0000 (10:35 +0000)]
Merge branch 'issue/1509' into 'develop'

[#1509]  purge media from cache after delete

See merge request pleroma/pleroma!2539

4 years agoChangelog: Add background to instance
lain [Wed, 20 May 2020 10:14:17 +0000 (12:14 +0200)]
Changelog: Add background to instance

4 years agoDocs: Add background_image in instance
lain [Wed, 20 May 2020 10:13:57 +0000 (12:13 +0200)]
Docs: Add background_image in instance

4 years agoInstanceOperation: Add background image to example
lain [Wed, 20 May 2020 10:12:07 +0000 (12:12 +0200)]
InstanceOperation: Add background image to example

4 years agoMerge branch 'mastofe/bundle-2020-05-20' into 'develop'
lain [Wed, 20 May 2020 09:12:35 +0000 (09:12 +0000)]
Merge branch 'mastofe/bundle-2020-05-20' into 'develop'

MastoFE: update to bundle-2020-05-20

See merge request pleroma/pleroma!2561

4 years agoMastoFE: update to bundle-2020-05-20
Haelwenn (lanodan) Monnier [Wed, 20 May 2020 05:55:14 +0000 (07:55 +0200)]
MastoFE: update to bundle-2020-05-20

4 years agoApply suggestion to installation/nginx-cache-purge.sh.example
Maksim [Wed, 20 May 2020 04:12:21 +0000 (04:12 +0000)]
Apply suggestion to installation/nginx-cache-purge.sh.example

4 years agoMerge branch 'openapi/pleroma-api/scrobble' into 'develop'
Haelwenn [Wed, 20 May 2020 04:00:46 +0000 (04:00 +0000)]
Merge branch 'openapi/pleroma-api/scrobble' into 'develop'

Add OpenAPI spec for PleromaAPI.ScrobbleController

See merge request pleroma/pleroma!2559

4 years agoupdate purge script
Maksim Pechnikov [Wed, 20 May 2020 03:56:04 +0000 (06:56 +0300)]
update purge script

4 years agoSynchronize :fe settings in config.exs
Mark Felder [Tue, 19 May 2020 21:05:39 +0000 (16:05 -0500)]
Synchronize :fe settings in config.exs

4 years agoMerge branch 'recipients-query-speedup' into 'develop'
rinpatch [Tue, 19 May 2020 14:32:27 +0000 (14:32 +0000)]
Merge branch 'recipients-query-speedup' into 'develop'

Greatly speed up recipients query

See merge request pleroma/pleroma!2558

4 years agoFix summary
Egor Kislitsyn [Tue, 19 May 2020 13:29:58 +0000 (17:29 +0400)]
Fix summary

4 years agoUser.Query: Remove superfluous `distinct`
lain [Tue, 19 May 2020 12:36:34 +0000 (14:36 +0200)]
User.Query: Remove superfluous `distinct`

4 years agoUserTest: Hide warning in tests.
lain [Tue, 19 May 2020 12:36:13 +0000 (14:36 +0200)]
UserTest: Hide warning in tests.

4 years agoMove Scrobble views to ScrobbleView
Egor Kislitsyn [Tue, 19 May 2020 12:11:59 +0000 (16:11 +0400)]
Move Scrobble views to ScrobbleView

4 years agoAdd OpenAPI spec for PleromaAPI.ScrobbleController
Egor Kislitsyn [Tue, 19 May 2020 11:53:18 +0000 (15:53 +0400)]
Add OpenAPI spec for PleromaAPI.ScrobbleController

4 years agoUser.Query: Speed up recipients query.
lain [Tue, 19 May 2020 12:11:32 +0000 (14:11 +0200)]
User.Query: Speed up recipients query.

4 years agoMerge branch 'deps/update-crypt' into 'develop'
lain [Tue, 19 May 2020 11:57:01 +0000 (11:57 +0000)]
Merge branch 'deps/update-crypt' into 'develop'

Update crypt library

See merge request pleroma/pleroma!2557

4 years agoUpdate crypt library
Roman Chvanikov [Tue, 19 May 2020 11:46:06 +0000 (14:46 +0300)]
Update crypt library

4 years agoFix typo
Egor Kislitsyn [Tue, 19 May 2020 10:59:50 +0000 (14:59 +0400)]
Fix typo

4 years agoMerge branch 'openapi/pleroma-api/mascot' into 'develop'
Haelwenn [Tue, 19 May 2020 09:41:57 +0000 (09:41 +0000)]
Merge branch 'openapi/pleroma-api/mascot' into 'develop'

Add OpenAPI spec for MascotController

See merge request pleroma/pleroma!2553

4 years agoMerge branch 'issue/1667' into 'develop'
Haelwenn [Tue, 19 May 2020 06:56:44 +0000 (06:56 +0000)]
Merge branch 'issue/1667' into 'develop'

[#1667] fix api/v1/accounts/update_credentials

See merge request pleroma/pleroma!2556

4 years agoMerge branch 'support/docs' into 'develop'
Haelwenn [Tue, 19 May 2020 06:43:57 +0000 (06:43 +0000)]
Merge branch 'support/docs' into 'develop'

fix docs

See merge request pleroma/pleroma!2555

4 years agofix api/v1/accounts/update_credentials
Maksim Pechnikov [Tue, 19 May 2020 06:42:41 +0000 (09:42 +0300)]
fix api/v1/accounts/update_credentials

4 years agoremoved Quantum from docs
Maksim Pechnikov [Tue, 19 May 2020 03:15:42 +0000 (06:15 +0300)]
removed Quantum from docs

4 years agoadded tests
Maksim Pechnikov [Mon, 18 May 2020 06:22:26 +0000 (09:22 +0300)]
added tests

4 years agoFix API documentation
Egor Kislitsyn [Mon, 18 May 2020 18:01:38 +0000 (22:01 +0400)]
Fix API documentation

4 years agoAdd OpenAPI spec for MascotController
Egor Kislitsyn [Mon, 18 May 2020 18:00:32 +0000 (22:00 +0400)]
Add OpenAPI spec for MascotController

4 years agoMerge branch 'openapi/use-boolean-like-in-requests' into 'develop'
rinpatch [Mon, 18 May 2020 17:13:53 +0000 (17:13 +0000)]
Merge branch 'openapi/use-boolean-like-in-requests' into 'develop'

[OpenAPI] Use BooleanLike in all request bodies

Closes #1782

See merge request pleroma/pleroma!2551

4 years ago[OpenAPI] Use BooleanLike in all request bodies
Egor Kislitsyn [Mon, 18 May 2020 16:58:59 +0000 (20:58 +0400)]
[OpenAPI] Use BooleanLike in all request bodies

4 years agoMerge branch 'direct-timeline-with-muted-param-fix' into 'develop'
lain [Mon, 18 May 2020 16:27:54 +0000 (16:27 +0000)]
Merge branch 'direct-timeline-with-muted-param-fix' into 'develop'

Fixed missing support for `with_muted` param in direct timeline

See merge request pleroma/pleroma!2548

4 years agoFixed missing support for `with_muted` param in direct timeline.
Ivan Tashkinov [Mon, 18 May 2020 16:00:00 +0000 (19:00 +0300)]
Fixed missing support for `with_muted` param in direct timeline.

4 years agoRename EmojiAPIController to EmojiPackController
Egor Kislitsyn [Mon, 18 May 2020 15:38:22 +0000 (19:38 +0400)]
Rename EmojiAPIController to EmojiPackController

4 years agoCleanup Pleroma.Emoji.Pack
Egor Kislitsyn [Mon, 18 May 2020 15:43:23 +0000 (19:43 +0400)]
Cleanup Pleroma.Emoji.Pack

4 years agoAdd OpenAPI spec for PleromaAPI.EmojiAPIController
Egor Kislitsyn [Thu, 14 May 2020 15:21:51 +0000 (19:21 +0400)]
Add OpenAPI spec for PleromaAPI.EmojiAPIController

4 years agoAnnounceValidator: Validate for existing announce
lain [Mon, 18 May 2020 14:54:10 +0000 (16:54 +0200)]
AnnounceValidator: Validate for existing announce

4 years agoObjectValidators: Add basic Announce validator.
lain [Mon, 18 May 2020 14:45:11 +0000 (16:45 +0200)]
ObjectValidators: Add basic Announce validator.

4 years agoTransmogrifierTest: Fix tests.
lain [Mon, 18 May 2020 13:47:26 +0000 (15:47 +0200)]
TransmogrifierTest: Fix tests.

4 years agoTransmogrifier Test: Extract Announce handling.
lain [Mon, 18 May 2020 12:48:37 +0000 (14:48 +0200)]
Transmogrifier Test: Extract Announce handling.

4 years agoMerge branch 'copyright' into 'develop'
lain [Mon, 18 May 2020 12:35:27 +0000 (12:35 +0000)]
Merge branch 'copyright' into 'develop'

Copyright update

See merge request pleroma/pleroma!2547

4 years agocopyright update
Alexander Strizhakov [Mon, 18 May 2020 12:15:51 +0000 (15:15 +0300)]
copyright update

4 years agoMerge branch '1778-benchmark-fix' into 'develop'
lain [Mon, 18 May 2020 12:14:24 +0000 (12:14 +0000)]
Merge branch '1778-benchmark-fix' into 'develop'

Load Testing: adjust to new CommonAPI.post format.

Closes #1778

See merge request pleroma/pleroma!2546

4 years agoMerge branch 'docs/storing-remote-media' into 'develop'
lain [Mon, 18 May 2020 11:59:07 +0000 (11:59 +0000)]
Merge branch 'docs/storing-remote-media' into 'develop'

Document how to store remote media permanently

See merge request pleroma/pleroma!1871

4 years agoLoad Testing: adjust to new CommonAPI.post format.
lain [Mon, 18 May 2020 11:56:58 +0000 (13:56 +0200)]
Load Testing: adjust to new CommonAPI.post format.

4 years agoInstanceView: Expose background image link.
lain [Mon, 18 May 2020 11:28:50 +0000 (13:28 +0200)]
InstanceView: Expose background image link.

This will make it easier for more clients to support this feature.

4 years agoMerge branch 'show-media-endpoint-fixes' into 'develop'
lain [Mon, 18 May 2020 10:57:59 +0000 (10:57 +0000)]
Merge branch 'show-media-endpoint-fixes' into 'develop'

MediaController OAuth scope assignments fix

See merge request pleroma/pleroma!2541

4 years agoMerge branch '1763-password-updates' into 'develop'
rinpatch [Mon, 18 May 2020 07:57:13 +0000 (07:57 +0000)]
Merge branch '1763-password-updates' into 'develop'

Authentication Plug: Update bcrypt password on login.

Closes #1763

See merge request pleroma/pleroma!2542

4 years agoMediaController: enforced owner-only access in :show action.
Ivan Tashkinov [Mon, 18 May 2020 06:51:53 +0000 (09:51 +0300)]
MediaController: enforced owner-only access in :show action.
Improved error response on denied access (now 403). Adjusted tests.