Egor Kislitsyn [Wed, 20 May 2020 14:00:41 +0000 (18:00 +0400)]
Move status actions to AdminAPI.StatusController
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
Mark Felder [Wed, 20 May 2020 17:22:31 +0000 (12:22 -0500)]
Also add new sidebarRight setting
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
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
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
Egor Kislitsyn [Wed, 20 May 2020 11:18:58 +0000 (15:18 +0400)]
Add `background_image` to `InstanceOperation`
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
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
lain [Wed, 20 May 2020 10:14:17 +0000 (12:14 +0200)]
Changelog: Add background to instance
lain [Wed, 20 May 2020 10:13:57 +0000 (12:13 +0200)]
Docs: Add background_image in instance
lain [Wed, 20 May 2020 10:12:07 +0000 (12:12 +0200)]
InstanceOperation: Add background image to example
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
Haelwenn (lanodan) Monnier [Wed, 20 May 2020 05:55:14 +0000 (07:55 +0200)]
MastoFE: update to bundle-2020-05-20
Maksim [Wed, 20 May 2020 04:12:21 +0000 (04:12 +0000)]
Apply suggestion to installation/nginx-cache-purge.sh.example
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
Maksim Pechnikov [Wed, 20 May 2020 03:56:04 +0000 (06:56 +0300)]
update purge script
Mark Felder [Tue, 19 May 2020 21:05:39 +0000 (16:05 -0500)]
Synchronize :fe settings in config.exs
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
Egor Kislitsyn [Tue, 19 May 2020 13:29:58 +0000 (17:29 +0400)]
Fix summary
lain [Tue, 19 May 2020 12:36:34 +0000 (14:36 +0200)]
User.Query: Remove superfluous `distinct`
lain [Tue, 19 May 2020 12:36:13 +0000 (14:36 +0200)]
UserTest: Hide warning in tests.
Egor Kislitsyn [Tue, 19 May 2020 12:11:59 +0000 (16:11 +0400)]
Move Scrobble views to ScrobbleView
Egor Kislitsyn [Tue, 19 May 2020 11:53:18 +0000 (15:53 +0400)]
Add OpenAPI spec for PleromaAPI.ScrobbleController
lain [Tue, 19 May 2020 12:11:32 +0000 (14:11 +0200)]
User.Query: Speed up recipients query.
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
Roman Chvanikov [Tue, 19 May 2020 11:46:06 +0000 (14:46 +0300)]
Update crypt library
Egor Kislitsyn [Tue, 19 May 2020 10:59:50 +0000 (14:59 +0400)]
Fix typo
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
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
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
Maksim Pechnikov [Tue, 19 May 2020 06:42:41 +0000 (09:42 +0300)]
fix api/v1/accounts/update_credentials
Maksim Pechnikov [Tue, 19 May 2020 03:15:42 +0000 (06:15 +0300)]
removed Quantum from docs
Maksim Pechnikov [Mon, 18 May 2020 06:22:26 +0000 (09:22 +0300)]
added tests
Egor Kislitsyn [Mon, 18 May 2020 18:01:38 +0000 (22:01 +0400)]
Fix API documentation
Egor Kislitsyn [Mon, 18 May 2020 18:00:32 +0000 (22:00 +0400)]
Add OpenAPI spec for MascotController
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
Egor Kislitsyn [Mon, 18 May 2020 16:58:59 +0000 (20:58 +0400)]
[OpenAPI] Use BooleanLike in all request bodies
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
Ivan Tashkinov [Mon, 18 May 2020 16:00:00 +0000 (19:00 +0300)]
Fixed missing support for `with_muted` param in direct timeline.
Egor Kislitsyn [Mon, 18 May 2020 15:38:22 +0000 (19:38 +0400)]
Rename EmojiAPIController to EmojiPackController
Egor Kislitsyn [Mon, 18 May 2020 15:43:23 +0000 (19:43 +0400)]
Cleanup Pleroma.Emoji.Pack
Egor Kislitsyn [Thu, 14 May 2020 15:21:51 +0000 (19:21 +0400)]
Add OpenAPI spec for PleromaAPI.EmojiAPIController
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
Alexander Strizhakov [Mon, 18 May 2020 12:15:51 +0000 (15:15 +0300)]
copyright update
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
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
lain [Mon, 18 May 2020 11:56:58 +0000 (13:56 +0200)]
Load Testing: adjust to new CommonAPI.post format.
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.
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
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
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.
Maksim Pechnikov [Mon, 18 May 2020 03:48:19 +0000 (06:48 +0300)]
updated docs
lain [Sun, 17 May 2020 09:53:17 +0000 (11:53 +0200)]
Pleroma Authenticator: Also update passwords here.
lain [Sun, 17 May 2020 09:40:25 +0000 (11:40 +0200)]
AuthenticationPlug: Also update crypt passwords.
lain [Sun, 17 May 2020 08:31:01 +0000 (10:31 +0200)]
Authentication Plug: Update bcrypt password on login.
lain [Sun, 17 May 2020 07:58:24 +0000 (07:58 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2535
Jędrzej Tomaszewski [Sat, 16 May 2020 14:06:36 +0000 (14:06 +0000)]
Translated using Weblate (Polish)
Currently translated at 65.0% (69 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
Fristi [Fri, 15 May 2020 09:37:44 +0000 (09:37 +0000)]
Added translation using Weblate (Dutch)
lain [Sun, 17 May 2020 07:48:52 +0000 (07:48 +0000)]
Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
Remove settings that shouldn't be altered
Closes admin-fe#110
See merge request pleroma/pleroma!2540
lain [Sun, 17 May 2020 07:26:56 +0000 (07:26 +0000)]
Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'
PleromaFE bundle supporting `with_relationships` param
See merge request pleroma/pleroma!2530
lain [Sun, 17 May 2020 07:26:51 +0000 (07:26 +0000)]
Merge branch 'restricted-relations-embedding' into 'develop'
Restricted support for embedded relationships
See merge request pleroma/pleroma!2456
Ivan Tashkinov [Sun, 17 May 2020 05:46:43 +0000 (08:46 +0300)]
MediaController OAuth scope assignments fix.
Typo fix (`def get_media` instead of `def show`).
Maksim Pechnikov [Sat, 16 May 2020 12:16:33 +0000 (15:16 +0300)]
added example cache purge script
Angelina Filippova [Sat, 16 May 2020 17:39:42 +0000 (20:39 +0300)]
Remove description of the settings that should't be altered
lain [Sat, 16 May 2020 17:13:38 +0000 (17:13 +0000)]
Merge branch 'features/mastoapi_v2_media' into 'develop'
MastodonAPI: /api/v2/media endpoints
See merge request pleroma/pleroma!2439
rinpatch [Sat, 16 May 2020 11:17:14 +0000 (11:17 +0000)]
Merge branch '1757-fix-unblocks-too' into 'develop'
CommonAPI: Unblock a user even if we don't have an activity.
Closes #1757
See merge request pleroma/pleroma!2538
lain [Sat, 16 May 2020 10:28:24 +0000 (12:28 +0200)]
CommonAPI: Unblock a user even if we don't have an activity.
Maksim Pechnikov [Fri, 15 May 2020 18:34:46 +0000 (21:34 +0300)]
added media proxy invalidation
lain [Fri, 15 May 2020 14:37:38 +0000 (14:37 +0000)]
Merge branch 'chore/update-fe-settings-and-docs' into 'develop'
Synchronize PleromaFE settings
See merge request pleroma/pleroma!2532
lain [Fri, 15 May 2020 14:22:59 +0000 (14:22 +0000)]
Merge branch 'fix/digest-task-otp' into 'develop'
Fix digest mix task on OTP releases
See merge request pleroma/pleroma!2526
lain [Fri, 15 May 2020 13:45:02 +0000 (13:45 +0000)]
Merge branch 'fix/database-config' into 'develop'
Returning partial chain
Closes #1772
See merge request pleroma/pleroma!2537
Alexander Strizhakov [Fri, 15 May 2020 13:16:02 +0000 (16:16 +0300)]
returning partial chain
rinpatch [Fri, 15 May 2020 11:13:08 +0000 (11:13 +0000)]
Merge branch 'openapi/nullable-request-fields' into 'develop'
[OpenAPI] Mark all not required request fields as nullable
Closes #1761
See merge request pleroma/pleroma!2536
Egor Kislitsyn [Fri, 15 May 2020 10:55:41 +0000 (14:55 +0400)]
[OpenAPI] Mark all not required request fields as nullable
rinpatch [Fri, 15 May 2020 05:06:29 +0000 (05:06 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2531
Michał Sidor [Thu, 14 May 2020 11:19:12 +0000 (11:19 +0000)]
Translated using Weblate (Polish)
Currently translated at 61.3% (65 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
Michał Sidor [Wed, 13 May 2020 16:49:25 +0000 (16:49 +0000)]
Translated using Weblate (Polish)
Currently translated at 55.6% (59 of 106 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
Michał Sidor [Wed, 13 May 2020 16:37:17 +0000 (16:37 +0000)]
Added translation using Weblate (Polish)
rinpatch [Thu, 14 May 2020 16:07:37 +0000 (16:07 +0000)]
Merge branch 'feature/database-configuration-whitelist' into 'develop'
Database configuration whitelist
See merge request pleroma/pleroma!2522
Stephanie Wilde-Hobbs [Thu, 14 May 2020 14:56:14 +0000 (15:56 +0100)]
Add config migration disclaimer to config whitelist documentation
lain [Thu, 14 May 2020 14:36:56 +0000 (14:36 +0000)]
Merge branch 'bcrypt-auth' into 'develop'
Handle bcrypt passwords for Mastodon migration
See merge request pleroma/pleroma!2527
Alex Gleason [Thu, 14 May 2020 13:42:27 +0000 (08:42 -0500)]
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw
Egor Kislitsyn [Thu, 14 May 2020 12:29:32 +0000 (16:29 +0400)]
Do not require `description` in `update` action
Egor Kislitsyn [Thu, 14 May 2020 12:18:30 +0000 (16:18 +0400)]
Fix OpenAPI spec
Stephanie Wilde-Hobbs [Thu, 14 May 2020 11:36:49 +0000 (12:36 +0100)]
Add Changelog entry
Stephanie Wilde-Hobbs [Thu, 14 May 2020 11:34:46 +0000 (12:34 +0100)]
Allow whitelisting whole groups
Steph [Thu, 14 May 2020 09:50:53 +0000 (09:50 +0000)]
Style fixes
Haelwenn (lanodan) Monnier [Thu, 14 May 2020 08:50:12 +0000 (10:50 +0200)]
Add OpenAPISpex for MediaController
lain [Thu, 14 May 2020 09:27:33 +0000 (09:27 +0000)]
Merge branch 'features/openrc-console' into 'develop'
init.d/pleroma: Add option to attach an elixir console
See merge request pleroma/pleroma!1704
lain [Thu, 14 May 2020 09:25:18 +0000 (09:25 +0000)]
Merge branch 'openapi/pleroma-api/accounts' into 'develop'
Add OpenAPI spec for PleromaAPI.AccountController
See merge request pleroma/pleroma!2528
lain [Thu, 14 May 2020 09:14:59 +0000 (09:14 +0000)]
Apply suggestion to docs/configuration/storing_remote_media.md
lain [Thu, 14 May 2020 09:09:11 +0000 (09:09 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
lain [Thu, 14 May 2020 09:07:09 +0000 (09:07 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
lain [Thu, 14 May 2020 08:22:53 +0000 (08:22 +0000)]
Merge branch 'pleroma_internal' into 'develop'
Add `pleroma_internal` as an internal field
See merge request pleroma/pleroma!2533
Haelwenn (lanodan) Monnier [Wed, 29 Apr 2020 15:38:14 +0000 (17:38 +0200)]
MastodonAPI: /api/v2/media endpoints
Mark Felder [Wed, 13 May 2020 22:07:14 +0000 (17:07 -0500)]
Lint
Mark Felder [Wed, 13 May 2020 21:57:33 +0000 (16:57 -0500)]
Clarify where the Features panel is
Mark Felder [Wed, 13 May 2020 21:51:23 +0000 (16:51 -0500)]
Formatting
Mark Felder [Wed, 13 May 2020 21:49:56 +0000 (16:49 -0500)]
Add missing showFeaturesPanel setting
projects / akkoma / log