akkoma
4 years agoMerge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
Ivan Tashkinov [Sat, 16 May 2020 13:14:50 +0000 (16:14 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy

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 agoMerge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
Ivan Tashkinov [Thu, 14 May 2020 17:19:56 +0000 (20:19 +0300)]
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy

# Conflicts:
# mix.lock

4 years ago[#2497] Added support for :eimp for image resizing.
Ivan Tashkinov [Thu, 14 May 2020 17:18:31 +0000 (20:18 +0300)]
[#2497] Added support for :eimp for image resizing.

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

4 years agofix eldap being required for non-OTP releases
rinpatch [Tue, 12 May 2020 20:03:21 +0000 (23:03 +0300)]
fix eldap being required for non-OTP releases

4 years agoMerge branch 'streamer-get-topic' into 'develop'
rinpatch [Tue, 12 May 2020 17:02:57 +0000 (17:02 +0000)]
Merge branch 'streamer-get-topic' into 'develop'

Expand and authorize streams in Streamer directly

See merge request pleroma/pleroma!2519

4 years agoFix typo in test
href [Tue, 12 May 2020 16:51:10 +0000 (18:51 +0200)]
Fix typo in test

4 years agoMerge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
rinpatch [Tue, 12 May 2020 16:45:46 +0000 (16:45 +0000)]
Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'

ActivityPub: Fix non-federating blocks.

Closes #1757

See merge request pleroma/pleroma!2514

4 years agoMerge branch '1748-remote-following-follower-count' into 'develop'
rinpatch [Tue, 12 May 2020 16:44:58 +0000 (16:44 +0000)]
Merge branch '1748-remote-following-follower-count' into 'develop'

Transmogrifier: On incoming follow accept, update follow counts.

Closes #1748

See merge request pleroma/pleroma!2515

4 years agoAdd database configuration whitelist
Stephanie Wilde-Hobbs [Tue, 12 May 2020 16:12:27 +0000 (17:12 +0100)]
Add database configuration whitelist

4 years agoExpand and authorize streams in Streamer directly
href [Tue, 12 May 2020 16:04:47 +0000 (18:04 +0200)]
Expand and authorize streams in Streamer directly

4 years agoMerge branch 'otp-version-update-suggestion' into 'develop'
lain [Tue, 12 May 2020 14:53:26 +0000 (14:53 +0000)]
Merge branch 'otp-version-update-suggestion' into 'develop'

Startup: suggest updating OTP when the version is too low for gun

See merge request pleroma/pleroma!2518

4 years agoMerge branch '1020-honk-announces' into 'develop'
lain [Tue, 12 May 2020 14:35:51 +0000 (14:35 +0000)]
Merge branch '1020-honk-announces' into 'develop'

Transmogrifier: Add tests for certain announces

Closes #1020

See merge request pleroma/pleroma!2516

4 years agoStartup: suggest updating OTP when the version is too low for gun
rinpatch [Tue, 12 May 2020 14:30:39 +0000 (17:30 +0300)]
Startup: suggest updating OTP when the version is too low for gun

I've seen quite a few people wonder what to do when presented with
this error message.

4 years agoMerge branch 'giving-up' into 'develop'
rinpatch [Tue, 12 May 2020 13:23:40 +0000 (13:23 +0000)]
Merge branch 'giving-up' into 'develop'

Give up for now and make gitlab retry failed jobs.

See merge request pleroma/pleroma!2517

4 years agoGive up for now and make gitlab retry failed jobs.
lain [Tue, 12 May 2020 13:02:37 +0000 (15:02 +0200)]
Give up for now and make gitlab retry failed jobs.

4 years agoTransmogrifier: Add tests for certain announces
lain [Tue, 12 May 2020 10:50:48 +0000 (12:50 +0200)]
Transmogrifier: Add tests for certain announces

4 years agoTransmogrifier: On incoming follow accept, update follow counts.
lain [Tue, 12 May 2020 10:29:37 +0000 (12:29 +0200)]
Transmogrifier: On incoming follow accept, update follow counts.

4 years agoActivityPub: Fix non-federating blocks.
lain [Tue, 12 May 2020 08:52:46 +0000 (10:52 +0200)]
ActivityPub: Fix non-federating blocks.

4 years agoMerge branch 'fix/issue-1676' into 'develop'
rinpatch [Mon, 11 May 2020 22:30:36 +0000 (22:30 +0000)]
Merge branch 'fix/issue-1676' into 'develop'

[#1676] fixed 'source' object in verify_credentials

See merge request pleroma/pleroma!2492

4 years agoMerge branch 'migration-fix-markers' into 'develop'
rinpatch [Mon, 11 May 2020 22:13:08 +0000 (22:13 +0000)]
Merge branch 'migration-fix-markers' into 'develop'

Markers migration: Fix migration for very large list of markers

See merge request pleroma/pleroma!2511

4 years agoMerge branch 'chore/gettext-update' into 'develop'
rinpatch [Mon, 11 May 2020 21:52:57 +0000 (21:52 +0000)]
Merge branch 'chore/gettext-update' into 'develop'

Gettext: remove english messages and update the pot file

See merge request pleroma/pleroma!2512

4 years agoGettext: remove english messages and update the pot file
rinpatch [Mon, 11 May 2020 21:40:13 +0000 (00:40 +0300)]
Gettext: remove english messages and update the pot file

Having an English file doesn't make any sense, since English
is the source language for error messages. Also Weblate complains about it

4 years ago[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.
Ivan Tashkinov [Mon, 11 May 2020 20:21:53 +0000 (23:21 +0300)]
[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.

4 years agoMigration: Fix typo
lain [Mon, 11 May 2020 20:03:29 +0000 (22:03 +0200)]
Migration: Fix typo

4 years agoMigration: Enum.chunk is deprecated.
lain [Mon, 11 May 2020 20:00:01 +0000 (22:00 +0200)]
Migration: Enum.chunk is deprecated.

4 years agoMarkers migration: Fix migration for very large list of markers
lain [Mon, 11 May 2020 19:52:47 +0000 (21:52 +0200)]
Markers migration: Fix migration for very large list of markers

4 years agoMerge branch 'fix/streamer-timeout' into 'develop'
rinpatch [Mon, 11 May 2020 17:07:55 +0000 (17:07 +0000)]
Merge branch 'fix/streamer-timeout' into 'develop'

Fix streamer timeout

Closes #1735 and #1753

See merge request pleroma/pleroma!2509