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

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 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.

4 years agoPleroma Authenticator: Also update passwords here.
lain [Sun, 17 May 2020 09:53:17 +0000 (11:53 +0200)]
Pleroma Authenticator: Also update passwords here.

4 years agoAuthenticationPlug: Also update crypt passwords.
lain [Sun, 17 May 2020 09:40:25 +0000 (11:40 +0200)]
AuthenticationPlug: Also update crypt passwords.

4 years agoAuthentication Plug: Update bcrypt password on login.
lain [Sun, 17 May 2020 08:31:01 +0000 (10:31 +0200)]
Authentication Plug: Update bcrypt password on login.

4 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
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

4 years agoTranslated using Weblate (Polish)
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/

4 years agoAdded translation using Weblate (Dutch)
Fristi [Fri, 15 May 2020 09:37:44 +0000 (09:37 +0000)]
Added translation using Weblate (Dutch)

4 years agoMerge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
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

4 years agoMerge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'
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

4 years agoMerge branch 'restricted-relations-embedding' into 'develop'
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

4 years agoMediaController OAuth scope assignments fix.
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`).

4 years agoRemove description of the settings that should't be altered
Angelina Filippova [Sat, 16 May 2020 17:39:42 +0000 (20:39 +0300)]
Remove description of the settings that should't be altered

4 years agoMerge branch 'features/mastoapi_v2_media' into 'develop'
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

4 years agoMerge branch '1757-fix-unblocks-too' into 'develop'
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

4 years agoCommonAPI: Unblock a user even if we don't have an activity.
lain [Sat, 16 May 2020 10:28:24 +0000 (12:28 +0200)]
CommonAPI: Unblock a user even if we don't have an activity.

4 years agoMerge branch 'chore/update-fe-settings-and-docs' into 'develop'
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

4 years agoMerge branch 'fix/digest-task-otp' into 'develop'
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

4 years agoMerge branch 'fix/database-config' into 'develop'
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

4 years agoreturning partial chain
Alexander Strizhakov [Fri, 15 May 2020 13:16:02 +0000 (16:16 +0300)]
returning partial chain

4 years agoMerge branch 'openapi/nullable-request-fields' into 'develop'
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

4 years ago[OpenAPI] Mark all not required request fields as nullable
Egor Kislitsyn [Fri, 15 May 2020 10:55:41 +0000 (14:55 +0400)]
[OpenAPI] Mark all not required request fields as nullable

4 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
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

4 years agoTranslated using Weblate (Polish)
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/

4 years agoTranslated using Weblate (Polish)
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/

4 years agoAdded translation using Weblate (Polish)
Michał Sidor [Wed, 13 May 2020 16:37:17 +0000 (16:37 +0000)]
Added translation using Weblate (Polish)

4 years agoMerge branch 'feature/database-configuration-whitelist' into 'develop'
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

4 years agoAdd config migration disclaimer to config whitelist documentation
Stephanie Wilde-Hobbs [Thu, 14 May 2020 14:56:14 +0000 (15:56 +0100)]
Add config migration disclaimer to config whitelist documentation

4 years agoMerge branch 'bcrypt-auth' into 'develop'
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

4 years agoPbkdf2.verify_pass --> AuthenticationPlug.checkpw
Alex Gleason [Thu, 14 May 2020 13:42:27 +0000 (08:42 -0500)]
Pbkdf2.verify_pass --> AuthenticationPlug.checkpw

4 years agoDo not require `description` in `update` action
Egor Kislitsyn [Thu, 14 May 2020 12:29:32 +0000 (16:29 +0400)]
Do not require `description` in `update` action

4 years agoFix OpenAPI spec
Egor Kislitsyn [Thu, 14 May 2020 12:18:30 +0000 (16:18 +0400)]
Fix OpenAPI spec

4 years agoAdd Changelog entry
Stephanie Wilde-Hobbs [Thu, 14 May 2020 11:36:49 +0000 (12:36 +0100)]
Add Changelog entry

4 years agoAllow whitelisting whole groups
Stephanie Wilde-Hobbs [Thu, 14 May 2020 11:34:46 +0000 (12:34 +0100)]
Allow whitelisting whole groups

4 years agoStyle fixes
Steph [Thu, 14 May 2020 09:50:53 +0000 (09:50 +0000)]
Style fixes

4 years agoAdd OpenAPISpex for MediaController
Haelwenn (lanodan) Monnier [Thu, 14 May 2020 08:50:12 +0000 (10:50 +0200)]
Add OpenAPISpex for MediaController

4 years agoMerge branch 'features/openrc-console' into 'develop'
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

4 years agoMerge branch 'openapi/pleroma-api/accounts' into 'develop'
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

4 years agoApply suggestion to docs/configuration/storing_remote_media.md
lain [Thu, 14 May 2020 09:14:59 +0000 (09:14 +0000)]
Apply suggestion to docs/configuration/storing_remote_media.md

4 years agoApply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
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

4 years agoApply 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

4 years agoMerge branch 'pleroma_internal' into 'develop'
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

4 years agoMastodonAPI: /api/v2/media endpoints
Haelwenn (lanodan) Monnier [Wed, 29 Apr 2020 15:38:14 +0000 (17:38 +0200)]
MastodonAPI: /api/v2/media endpoints

4 years agoLint
Mark Felder [Wed, 13 May 2020 22:07:14 +0000 (17:07 -0500)]
Lint

4 years agoClarify where the Features panel is
Mark Felder [Wed, 13 May 2020 21:57:33 +0000 (16:57 -0500)]
Clarify where the Features panel is

4 years agoFormatting
Mark Felder [Wed, 13 May 2020 21:51:23 +0000 (16:51 -0500)]
Formatting

4 years agoAdd missing showFeaturesPanel setting
Mark Felder [Wed, 13 May 2020 21:49:56 +0000 (16:49 -0500)]
Add missing showFeaturesPanel setting

4 years agoadd postContentType setting
Mark Felder [Wed, 13 May 2020 21:45:16 +0000 (16:45 -0500)]
add postContentType setting

4 years agoAdd missing nsfwCensorImage option
Mark Felder [Wed, 13 May 2020 21:40:04 +0000 (16:40 -0500)]
Add missing nsfwCensorImage option

4 years agoAdd missing hideSitename setting
Mark Felder [Wed, 13 May 2020 21:36:33 +0000 (16:36 -0500)]
Add missing hideSitename setting

4 years agoAdd hideFilteredStatuses and hideMutedPosts settings
Mark Felder [Wed, 13 May 2020 21:35:12 +0000 (16:35 -0500)]
Add hideFilteredStatuses and hideMutedPosts settings

4 years agoAdd greentext option
Mark Felder [Wed, 13 May 2020 21:32:38 +0000 (16:32 -0500)]
Add greentext option

4 years agoformattingOptionsEnabled no longer exists
Mark Felder [Wed, 13 May 2020 21:31:15 +0000 (16:31 -0500)]
formattingOptionsEnabled no longer exists

4 years agoAdd disableChat option
Mark Felder [Wed, 13 May 2020 21:30:24 +0000 (16:30 -0500)]
Add disableChat option

4 years agoSpelling/grammar
Mark Felder [Wed, 13 May 2020 21:26:49 +0000 (16:26 -0500)]
Spelling/grammar

4 years agoenableEmojiPicker is not a setting
Mark Felder [Wed, 13 May 2020 21:24:37 +0000 (16:24 -0500)]
enableEmojiPicker is not a setting

4 years agoscopeOptionsEnabled has been replaced with minimalScopesMode
Mark Felder [Wed, 13 May 2020 21:23:42 +0000 (16:23 -0500)]
scopeOptionsEnabled has been replaced with minimalScopesMode

4 years agoStickers setting does not exist
Mark Felder [Wed, 13 May 2020 21:19:17 +0000 (16:19 -0500)]
Stickers setting does not exist

4 years agoAlpha sort FE config descriptions
Mark Felder [Wed, 13 May 2020 21:18:26 +0000 (16:18 -0500)]
Alpha sort FE config descriptions

4 years agoAdd `pleroma_internal` as an internal field
Alex Gleason [Wed, 13 May 2020 21:14:24 +0000 (16:14 -0500)]
Add `pleroma_internal` as an internal field

4 years agoSynchronize suggestions with all available static/config.json settings
Mark Felder [Wed, 13 May 2020 21:03:42 +0000 (16:03 -0500)]
Synchronize suggestions with all available static/config.json settings

4 years agoSync FE static/config.json
Mark Felder [Wed, 13 May 2020 20:57:39 +0000 (15:57 -0500)]
Sync FE static/config.json

4 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
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

4 years agoPleromaFE bundle supporting `with_relationships` param.
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

4 years ago[#2456] OpenAPI-related tweaks. Removed support for `with_relationships` param in...
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`.

4 years agoHandle bcrypt passwords for Mastodon migration
Alex Gleason [Tue, 12 May 2020 21:57:01 +0000 (16:57 -0500)]
Handle bcrypt passwords for Mastodon migration

4 years agoAdd OpenAPI spec for PleromaAPI.AccountController
Egor Kislitsyn [Wed, 13 May 2020 15:06:25 +0000 (19:06 +0400)]
Add OpenAPI spec for PleromaAPI.AccountController

4 years agoTranslated using Weblate (French)
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/

4 years agoMerge branch 'fix/1742-random-failing-tests' into 'develop'
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

4 years ago[#2456] Changed `embed_relationships` param to `with_relationships`.
Ivan Tashkinov [Wed, 13 May 2020 12:08:07 +0000 (15:08 +0300)]
[#2456] Changed `embed_relationships` param to `with_relationships`.

4 years agoFix digest mix task on OTP releases
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.

4 years agoMerge branch 'openapi/suggestions' into 'develop'
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

4 years agoAdd OpenAPI spec for SuggestionController
Egor Kislitsyn [Wed, 13 May 2020 10:15:24 +0000 (14:15 +0400)]
Add OpenAPI spec for SuggestionController

4 years ago[#2456] Post-merge fix.
Ivan Tashkinov [Wed, 13 May 2020 09:50:52 +0000 (12:50 +0300)]
[#2456] Post-merge fix.

4 years agoMerge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
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

4 years agoMerge branch 'openapi/statuses' into 'develop'
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

4 years agoMerge branch 'openapi/timelines' into 'develop'
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

4 years agoignore order
Alexander Strizhakov [Wed, 13 May 2020 07:17:47 +0000 (10:17 +0300)]
ignore order

4 years agodon't use async with global mocks
Alexander Strizhakov [Wed, 13 May 2020 06:29:41 +0000 (09:29 +0300)]
don't use async with global mocks

4 years agodon't use global mocks in setup callbacks
Alexander Strizhakov [Wed, 13 May 2020 06:20:25 +0000 (09:20 +0300)]
don't use global mocks in setup callbacks

4 years agodon't run in async if tests depend on env config
Alexander Strizhakov [Wed, 13 May 2020 05:00:17 +0000 (08:00 +0300)]
don't run in async if tests depend on env config

4 years agocorrect order for publised in assert
Alexander Strizhakov [Tue, 12 May 2020 09:12:10 +0000 (12:12 +0300)]
correct order for publised in assert

4 years agomake test fail everytime
Alexander Strizhakov [Mon, 11 May 2020 12:22:52 +0000 (15:22 +0300)]
make test fail everytime

4 years agodon't run tests which change env in async
Alexander Strizhakov [Mon, 11 May 2020 12:07:05 +0000 (15:07 +0300)]
don't run tests which change env in async

4 years ago{:error, :enoent} s3 fix
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

4 years agoMerge branch 'upgrade-comeonin' into 'develop'
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

4 years agoUpgrade Comeonin to v5
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

4 years agoFix format
Egor Kislitsyn [Tue, 12 May 2020 21:59:17 +0000 (01:59 +0400)]
Fix format

4 years agoApply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
minibikini [Tue, 12 May 2020 21:23:43 +0000 (21:23 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex

4 years agoApply 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

4 years agoApply 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

4 years agoApply 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

4 years agoApply 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

4 years agoApply 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

4 years agoAdd OpenAPI spec for StatusController
Egor Kislitsyn [Tue, 12 May 2020 19:59:26 +0000 (23:59 +0400)]
Add OpenAPI spec for StatusController

4 years agoMerge branch 'fix/eldap-required' into 'develop'
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

4 years agoFilter config descriptions by config whitelist
Stephanie Wilde-Hobbs [Tue, 12 May 2020 20:07:33 +0000 (21:07 +0100)]
Filter config descriptions by config whitelist