Alexander Strizhakov [Mon, 18 May 2020 12:15:51 +0000 (15:15 +0300)]
copyright update
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 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.
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`).
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.
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
Mark Felder [Wed, 13 May 2020 21:45:16 +0000 (16:45 -0500)]
add postContentType setting
Mark Felder [Wed, 13 May 2020 21:40:04 +0000 (16:40 -0500)]
Add missing nsfwCensorImage option
Mark Felder [Wed, 13 May 2020 21:36:33 +0000 (16:36 -0500)]
Add missing hideSitename setting
Mark Felder [Wed, 13 May 2020 21:35:12 +0000 (16:35 -0500)]
Add hideFilteredStatuses and hideMutedPosts settings
Mark Felder [Wed, 13 May 2020 21:32:38 +0000 (16:32 -0500)]
Add greentext option
Mark Felder [Wed, 13 May 2020 21:31:15 +0000 (16:31 -0500)]
formattingOptionsEnabled no longer exists
Mark Felder [Wed, 13 May 2020 21:30:24 +0000 (16:30 -0500)]
Add disableChat option
Mark Felder [Wed, 13 May 2020 21:26:49 +0000 (16:26 -0500)]
Spelling/grammar
Mark Felder [Wed, 13 May 2020 21:24:37 +0000 (16:24 -0500)]
enableEmojiPicker is not a setting
Mark Felder [Wed, 13 May 2020 21:23:42 +0000 (16:23 -0500)]
scopeOptionsEnabled has been replaced with minimalScopesMode
Mark Felder [Wed, 13 May 2020 21:19:17 +0000 (16:19 -0500)]
Stickers setting does not exist
Mark Felder [Wed, 13 May 2020 21:18:26 +0000 (16:18 -0500)]
Alpha sort FE config descriptions
Alex Gleason [Wed, 13 May 2020 21:14:24 +0000 (16:14 -0500)]
Add `pleroma_internal` as an internal field
Mark Felder [Wed, 13 May 2020 21:03:42 +0000 (16:03 -0500)]
Synchronize suggestions with all available static/config.json settings
Mark Felder [Wed, 13 May 2020 20:57:39 +0000 (15:57 -0500)]
Sync FE static/config.json
rinpatch [Wed, 13 May 2020 16:26:34 +0000 (16:26 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2529
Ivan Tashkinov [Wed, 13 May 2020 16:20:21 +0000 (19:20 +0300)]
PleromaFE bundle supporting `with_relationships` param.
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=
9c7cb3a95431bbea44391f79da465f77565a4b49
Ivan Tashkinov [Wed, 13 May 2020 15:56:45 +0000 (18:56 +0300)]
[#2456] OpenAPI-related tweaks. Removed support for `with_relationships` param in `GET /api/v1/accounts/search`.
Alex Gleason [Tue, 12 May 2020 21:57:01 +0000 (16:57 -0500)]
Handle bcrypt passwords for Mastodon migration
Egor Kislitsyn [Wed, 13 May 2020 15:06:25 +0000 (19:06 +0400)]
Add OpenAPI spec for PleromaAPI.AccountController
Haelwenn (lanodan) Monnier [Mon, 11 May 2020 23:08:20 +0000 (23:08 +0000)]
Translated using Weblate (French)
Currently translated at 100.0% (90 of 90 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/fr/
lain [Wed, 13 May 2020 13:38:32 +0000 (13:38 +0000)]
Merge branch 'fix/1742-random-failing-tests' into 'develop'
Fix sporadically failing tests
See merge request pleroma/pleroma!2524
Ivan Tashkinov [Wed, 13 May 2020 12:08:07 +0000 (15:08 +0300)]
[#2456] Changed `embed_relationships` param to `with_relationships`.
Michael Weiss [Wed, 13 May 2020 11:08:10 +0000 (13:08 +0200)]
Fix digest mix task on OTP releases
This is based on #2191, credit belongs to @rinpatch.
lain [Wed, 13 May 2020 10:34:04 +0000 (10:34 +0000)]
Merge branch 'openapi/suggestions' into 'develop'
Add OpenAPI spec for SuggestionController
See merge request pleroma/pleroma!2525
Egor Kislitsyn [Wed, 13 May 2020 10:15:24 +0000 (14:15 +0400)]
Add OpenAPI spec for SuggestionController
Ivan Tashkinov [Wed, 13 May 2020 09:50:52 +0000 (12:50 +0300)]
[#2456] Post-merge fix.
Ivan Tashkinov [Wed, 13 May 2020 09:42:36 +0000 (12:42 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
# Conflicts:
# lib/pleroma/web/mastodon_api/controllers/status_controller.ex
# lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
# test/web/mastodon_api/controllers/timeline_controller_test.exs
# test/web/mastodon_api/views/status_view_test.exs
lain [Wed, 13 May 2020 09:34:30 +0000 (09:34 +0000)]
Merge branch 'openapi/statuses' into 'develop'
Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521
lain [Wed, 13 May 2020 09:33:37 +0000 (09:33 +0000)]
Merge branch 'openapi/timelines' into 'develop'
Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506
Alexander Strizhakov [Wed, 13 May 2020 07:17:47 +0000 (10:17 +0300)]
ignore order
Alexander Strizhakov [Wed, 13 May 2020 06:29:41 +0000 (09:29 +0300)]
don't use async with global mocks
Alexander Strizhakov [Wed, 13 May 2020 06:20:25 +0000 (09:20 +0300)]
don't use global mocks in setup callbacks
Alexander Strizhakov [Wed, 13 May 2020 05:00:17 +0000 (08:00 +0300)]
don't run in async if tests depend on env config
Alexander Strizhakov [Tue, 12 May 2020 09:12:10 +0000 (12:12 +0300)]
correct order for publised in assert
Alexander Strizhakov [Mon, 11 May 2020 12:22:52 +0000 (15:22 +0300)]
make test fail everytime
Alexander Strizhakov [Mon, 11 May 2020 12:07:05 +0000 (15:07 +0300)]
don't run tests which change env in async
Alexander Strizhakov [Fri, 8 May 2020 15:51:16 +0000 (18:51 +0300)]
{:error, :enoent} s3 fix
s3 tests were executed before temp file was uploaded
lain [Wed, 13 May 2020 07:45:35 +0000 (07:45 +0000)]
Merge branch 'upgrade-comeonin' into 'develop'
Upgrade Comeonin to v5
See merge request pleroma/pleroma!2523
Alex Gleason [Tue, 12 May 2020 21:42:24 +0000 (16:42 -0500)]
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
Egor Kislitsyn [Tue, 12 May 2020 21:59:17 +0000 (01:59 +0400)]
Fix format
minibikini [Tue, 12 May 2020 21:23:43 +0000 (21:23 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:23:36 +0000 (21:23 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:23:21 +0000 (21:23 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:14:52 +0000 (21:14 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:12:22 +0000 (21:12 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:09:26 +0000 (21:09 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
Egor Kislitsyn [Tue, 12 May 2020 19:59:26 +0000 (23:59 +0400)]
Add OpenAPI spec for StatusController
rinpatch [Tue, 12 May 2020 20:20:19 +0000 (20:20 +0000)]
Merge branch 'fix/eldap-required' into 'develop'
fix eldap being required for non-OTP releases
See merge request pleroma/pleroma!2520
Stephanie Wilde-Hobbs [Tue, 12 May 2020 20:07:33 +0000 (21:07 +0100)]
Filter config descriptions by config whitelist
projects / akkoma / log