akkoma
3 years agoImprove OpenAPI spec and deploy it to api.pleroma.social
rinpatch [Wed, 3 Feb 2021 12:38:59 +0000 (15:38 +0300)]
Improve OpenAPI spec and deploy it to api.pleroma.social

Too many changes in OpenAPI spec to describe each one, but
basically it is tag fixes, bringing consitency to operation summaries
and fixing some incorrect information.

3 years agoMerge branch 'test-cases-mox-setup' into 'develop'
lain [Thu, 21 Jan 2021 09:03:26 +0000 (09:03 +0000)]
Merge branch 'test-cases-mox-setup' into 'develop'

Mox mode setup tweak; refactoring

See merge request pleroma/pleroma!3263

3 years agoMerge branch 'copyright-fun' into 'develop'
feld [Wed, 20 Jan 2021 22:51:56 +0000 (22:51 +0000)]
Merge branch 'copyright-fun' into 'develop'

Mix aliases for handling copyright headers

See merge request pleroma/pleroma!3257

3 years agoMerge branch 'deprecate-public_endpoint' into 'develop'
feld [Wed, 20 Jan 2021 22:48:48 +0000 (22:48 +0000)]
Merge branch 'deprecate-public_endpoint' into 'develop'

Deprecate Uploaders.S3, :public_endpoint

See merge request pleroma/pleroma!3251

3 years agoConsistent comment style for :ex_aws
Mark Felder [Wed, 20 Jan 2021 22:39:39 +0000 (16:39 -0600)]
Consistent comment style for :ex_aws

3 years agoAdd bucket_namespace to be extra certain truncated_namespace works
Mark Felder [Wed, 20 Jan 2021 22:33:00 +0000 (16:33 -0600)]
Add bucket_namespace to be extra certain truncated_namespace works

3 years agoMerge branch 'update/oban' into 'develop'
feld [Wed, 20 Jan 2021 20:32:23 +0000 (20:32 +0000)]
Merge branch 'update/oban' into 'develop'

Update Oban to 2.3.4

See merge request pleroma/pleroma!3256

3 years agoMerge branch 'fix/active-user-query' into 'develop'
Haelwenn [Wed, 20 Jan 2021 20:07:30 +0000 (20:07 +0000)]
Merge branch 'fix/active-user-query' into 'develop'

Active users must be confirmed, and other related fixes

See merge request pleroma/pleroma!3267

3 years agoSpecial handling for unconfirmed users based on instance config no longer needed.
Mark Felder [Wed, 20 Jan 2021 17:30:29 +0000 (11:30 -0600)]
Special handling for unconfirmed users based on instance config no longer needed.

3 years agoOnly need to test if unconfirmed users are successfully deleted
Mark Felder [Wed, 20 Jan 2021 17:26:14 +0000 (11:26 -0600)]
Only need to test if unconfirmed users are successfully deleted

It's no longer possible to have an active user account with User.is_confirmed == false

3 years agoThis scenario no longer exists. Users are auto-confirmed if confirmation not required...
Mark Felder [Wed, 20 Jan 2021 17:17:13 +0000 (11:17 -0600)]
This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.

3 years agoSpecial handling for unconfirmed users based on instance config no longer needed.
Mark Felder [Wed, 20 Jan 2021 17:14:15 +0000 (11:14 -0600)]
Special handling for unconfirmed users based on instance config no longer needed.

3 years agouse correct versions for oban migrations
Alexander Strizhakov [Wed, 20 Jan 2021 17:07:24 +0000 (20:07 +0300)]
use correct versions for oban migrations

3 years agoActive users must be confirmed
Mark Felder [Tue, 19 Jan 2021 22:39:55 +0000 (16:39 -0600)]
Active users must be confirmed

3 years agoMerge branch 'update-changelog-reblog-fix' into 'develop'
lain [Tue, 19 Jan 2021 14:08:18 +0000 (14:08 +0000)]
Merge branch 'update-changelog-reblog-fix' into 'develop'

Add Reblog fix to CHANGELOG

See merge request pleroma/pleroma!3266

3 years agoAdd Reblog fix to CHANGELOG
Egor Kislitsyn [Tue, 19 Jan 2021 13:57:00 +0000 (17:57 +0400)]
Add Reblog fix to CHANGELOG

3 years agoMerge branch 'feat/improved-postgres-tuning-docs' into 'develop'
lain [Tue, 19 Jan 2021 11:36:56 +0000 (11:36 +0000)]
Merge branch 'feat/improved-postgres-tuning-docs' into 'develop'

Improve PostgreSQL optimization article

See merge request pleroma/pleroma!3265

3 years agoImprove PostgreSQL optimization article
rinpatch [Tue, 19 Jan 2021 11:15:55 +0000 (14:15 +0300)]
Improve PostgreSQL optimization article

Move query plan mode setting from OTP installation guide and try
to explain what it does.

3 years agoMerge branch 'mergeback/2.2.2' into 'develop'
rinpatch [Tue, 19 Jan 2021 10:00:15 +0000 (10:00 +0000)]
Merge branch 'mergeback/2.2.2' into 'develop'

Mergeback/2.2.2

See merge request pleroma/pleroma!3264

3 years agoMerge branch 'stable' into mergeback/2.2.2
rinpatch [Tue, 19 Jan 2021 09:59:24 +0000 (12:59 +0300)]
Merge branch 'stable' into mergeback/2.2.2

3 years agoMerge branch 'weblate-pleroma-pleroma' into 'develop'
Haelwenn [Tue, 19 Jan 2021 02:34:27 +0000 (02:34 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'

Translations update from Weblate

See merge request pleroma/pleroma!3262

3 years agoMox mode setup tweak; refactoring.
Ivan Tashkinov [Mon, 18 Jan 2021 21:23:39 +0000 (00:23 +0300)]
Mox mode setup tweak; refactoring.

3 years agoTranslated using Weblate (Portuguese (Portugal))
João Rodrigues [Mon, 18 Jan 2021 17:19:16 +0000 (17:19 +0000)]
Translated using Weblate (Portuguese (Portugal))

Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pt_PT/

3 years agoAdded translation using Weblate (Portuguese (Portugal))
João Rodrigues [Mon, 18 Jan 2021 17:19:01 +0000 (17:19 +0000)]
Added translation using Weblate (Portuguese (Portugal))

3 years agoMerge branch 'fix/reblog-api' into 'develop'
feld [Mon, 18 Jan 2021 21:19:14 +0000 (21:19 +0000)]
Merge branch 'fix/reblog-api' into 'develop'

Fix Reblog API

Closes #2423

See merge request pleroma/pleroma!3261

3 years agoMerge branch 'refactor/approval_pending_user_field' into 'develop'
feld [Mon, 18 Jan 2021 19:58:30 +0000 (19:58 +0000)]
Merge branch 'refactor/approval_pending_user_field' into 'develop'

Change user.approval_pending field to user.is_approved

See merge request pleroma/pleroma!3090

3 years agoUpdate AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f
Mark Felder [Mon, 18 Jan 2021 19:44:59 +0000 (13:44 -0600)]
Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f

3 years agoDocument new is_approved attribute
Mark Felder [Mon, 18 Jan 2021 18:07:37 +0000 (12:07 -0600)]
Document new is_approved attribute

3 years agoMerge branch 'develop' into refactor/approval_pending_user_field
Mark Felder [Mon, 18 Jan 2021 18:05:05 +0000 (12:05 -0600)]
Merge branch 'develop' into refactor/approval_pending_user_field

3 years agoMerge branch 'refactor/confirmation_pending_user_field' into 'develop'
feld [Mon, 18 Jan 2021 17:54:42 +0000 (17:54 +0000)]
Merge branch 'refactor/confirmation_pending_user_field' into 'develop'

Change user.confirmation_pending field to user.is_confirmed

See merge request pleroma/pleroma!3081

3 years agoDocument new is_confirmed attribute
Mark Felder [Mon, 18 Jan 2021 17:31:07 +0000 (11:31 -0600)]
Document new is_confirmed attribute

3 years agoKeep *Breaking* at the top
Mark Felder [Mon, 18 Jan 2021 17:30:06 +0000 (11:30 -0600)]
Keep *Breaking* at the top

3 years agoUpdate AdminFE: pleroma/admin-fe@d4c7989f05f38fd4f30c234a13a6e51cac83be57
Mark Felder [Mon, 18 Jan 2021 17:25:13 +0000 (11:25 -0600)]
Update AdminFE: pleroma/admin-fe@d4c7989f05f38fd4f30c234a13a6e51cac83be57

3 years agoTest that only author can reblog a private status
Egor Kislitsyn [Mon, 18 Jan 2021 17:01:00 +0000 (21:01 +0400)]
Test that only author can reblog a private status

3 years agoFix Reblog API
Egor Kislitsyn [Mon, 18 Jan 2021 16:15:57 +0000 (20:15 +0400)]
Fix Reblog API

Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.

3 years agoMerge branch 'release/2.2.2' into 'stable'
rinpatch [Mon, 18 Jan 2021 14:33:28 +0000 (14:33 +0000)]
Merge branch 'release/2.2.2' into 'stable'

Release/2.2.2

See merge request pleroma/pleroma!3216

3 years agopleroma-fe bundle: update to 320418d524a33c20d7d769c8d67a25be81f251ec
rinpatch [Mon, 18 Jan 2021 14:04:06 +0000 (17:04 +0300)]
pleroma-fe bundle: update to 320418d524a33c20d7d769c8d67a25be81f251ec

3 years agomix.exs: bump version to 2.2.2
rinpatch [Mon, 18 Jan 2021 12:35:15 +0000 (15:35 +0300)]
mix.exs: bump version to 2.2.2

3 years agoCHANGELOG.md: Finalize 2.2.2 changelog
rinpatch [Mon, 18 Jan 2021 13:20:36 +0000 (16:20 +0300)]
CHANGELOG.md: Finalize 2.2.2 changelog

3 years agoMerge branch 'fix/missing_emoji_steal_dir' into 'develop'
lain [Fri, 8 Jan 2021 13:10:49 +0000 (13:10 +0000)]
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'

Create dir for EmojiStealPolicy automatically

See merge request pleroma/pleroma!3218

3 years agoMerge branch 'fix/changelog-entries' into 'develop'
lain [Sun, 17 Jan 2021 13:11:28 +0000 (13:11 +0000)]
Merge branch 'fix/changelog-entries' into 'develop'

CHANGELOG.md: Remove wrong entries from Unreleased(patch)

See merge request pleroma/pleroma!3258

3 years agoCHANGELOG.md: Remove wrong entries from Unreleased(patch)
rinpatch [Sun, 17 Jan 2021 12:55:33 +0000 (15:55 +0300)]
CHANGELOG.md: Remove wrong entries from Unreleased(patch)

Webpush changes are under 2.3.0 milestone and therefore should be
under Unreleased section

The emoji reaction change was introduced in 2.2.1

3 years agoupdate for retired elixir_make package version
Alexander Strizhakov [Tue, 22 Dec 2020 14:42:23 +0000 (17:42 +0300)]
update for retired elixir_make package version

3 years agostart oban app in migrations and mix tasks
Alexander Strizhakov [Sun, 17 Jan 2021 06:58:41 +0000 (09:58 +0300)]
start oban app in migrations and mix tasks

3 years agouse explicitly oban migration version
Alexander Strizhakov [Sun, 17 Jan 2021 06:58:07 +0000 (09:58 +0300)]
use explicitly oban migration version

3 years ago[#3251] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added...
Ivan Tashkinov [Sat, 16 Jan 2021 20:05:31 +0000 (23:05 +0300)]
[#3251] Fixed wrong test-env config setting for [Pleroma.Upload]. Refactoring. Added warning to `clear_config/_` to minimize such issues in future.

3 years agomix.exs: Make copyright regexes more precise
Haelwenn (lanodan) Monnier [Sat, 16 Jan 2021 01:38:37 +0000 (02:38 +0100)]
mix.exs: Make copyright regexes more precise

- Add copyright checks for Pleroma's not any copyright
- Copyright bump fixes the whole line instead of just the year

3 years agomix.exs: Put template into one variable with ~s[]
Haelwenn (lanodan) Monnier [Sat, 16 Jan 2021 01:17:24 +0000 (02:17 +0100)]
mix.exs: Put template into one variable with ~s[]

3 years agomix.exs: GNU sed doesn't into proper getopt()
Haelwenn (lanodan) Monnier [Sat, 16 Jan 2021 01:12:41 +0000 (02:12 +0100)]
mix.exs: GNU sed doesn't into proper getopt()

3 years agoAdd a mix alias to bump copyright
Mark Felder [Fri, 15 Jan 2021 23:26:02 +0000 (17:26 -0600)]
Add a mix alias to bump copyright

3 years agoSplit out year
Mark Felder [Fri, 15 Jan 2021 23:25:43 +0000 (17:25 -0600)]
Split out year

3 years agoAdd mix alias to easily add copyright headers to files
Mark Felder [Fri, 15 Jan 2021 22:53:55 +0000 (16:53 -0600)]
Add mix alias to easily add copyright headers to files

3 years agoUpdate Oban to 2.3.4
Mark Felder [Fri, 15 Jan 2021 20:58:33 +0000 (14:58 -0600)]
Update Oban to 2.3.4

3 years agoMerge branch 'fix/attachment-cleanup-queues' into 'develop'
feld [Fri, 15 Jan 2021 21:01:16 +0000 (21:01 +0000)]
Merge branch 'fix/attachment-cleanup-queues' into 'develop'

Only run one attachment cleanup job per node

See merge request pleroma/pleroma!3255

3 years agoOnly run one attachment cleanup job per node
Mark Felder [Fri, 15 Jan 2021 20:50:32 +0000 (14:50 -0600)]
Only run one attachment cleanup job per node

The previous limit of 5 was probably causing massing performance issues due to concurrent full table scans.

3 years agoRevert accidental blank line removal
Mark Felder [Fri, 15 Jan 2021 19:40:30 +0000 (13:40 -0600)]
Revert accidental blank line removal

3 years agoDocument removal of toggle_confirmed
Mark Felder [Tue, 13 Oct 2020 21:10:00 +0000 (16:10 -0500)]
Document removal of toggle_confirmed

3 years agoRemove toggle_confirmation; require explicit state change
Mark Felder [Tue, 13 Oct 2020 21:07:36 +0000 (16:07 -0500)]
Remove toggle_confirmation; require explicit state change

Also cosmetic changes to make the code clearer

3 years agoChange user.confirmation_pending field to user.is_confirmed
Mark Felder [Tue, 13 Oct 2020 19:29:34 +0000 (14:29 -0500)]
Change user.confirmation_pending field to user.is_confirmed

3 years agoFurther simplify changeset logic
Mark Felder [Fri, 16 Oct 2020 21:50:44 +0000 (21:50 +0000)]
Further simplify changeset logic

3 years agoChange user.approval_pending field to user.is_approved
Mark Felder [Fri, 16 Oct 2020 21:44:25 +0000 (21:44 +0000)]
Change user.approval_pending field to user.is_approved

3 years agoMerge branch 'optimize-command_available' into 'develop'
Haelwenn [Fri, 15 Jan 2021 04:44:58 +0000 (04:44 +0000)]
Merge branch 'optimize-command_available' into 'develop'

Optimize Pleroma.Utils.command_available?/1

See merge request pleroma/pleroma!3254

3 years agoHack to fix tests not passing. Unclear why the filters are being set to nil.
Mark Felder [Thu, 14 Jan 2021 23:49:37 +0000 (17:49 -0600)]
Hack to fix tests not passing. Unclear why the filters are being set to nil.
Both of these changes are needed or it doesn't work.

3 years agoJust validate command is in PATH; forking a shell is wasteful
Mark Felder [Thu, 14 Jan 2021 22:58:18 +0000 (16:58 -0600)]
Just validate command is in PATH; forking a shell is wasteful

3 years agoLint
Mark Felder [Thu, 14 Jan 2021 22:00:32 +0000 (16:00 -0600)]
Lint

3 years agoBump Copyright year
Mark Felder [Thu, 14 Jan 2021 19:58:52 +0000 (13:58 -0600)]
Bump Copyright year

3 years agoAdd ConfigDB migration
Mark Felder [Thu, 14 Jan 2021 19:53:35 +0000 (13:53 -0600)]
Add ConfigDB migration

3 years agoBackupTest: Fix s3 test.
Lain Soykaf [Thu, 14 Jan 2021 19:18:45 +0000 (20:18 +0100)]
BackupTest: Fix s3 test.

3 years agoMerge branch 'pleroma-password' into 'develop'
rinpatch [Thu, 14 Jan 2021 18:29:25 +0000 (18:29 +0000)]
Merge branch 'pleroma-password' into 'develop'

Add password module

See merge request pleroma/pleroma!3253

3 years agoLinting.
Lain Soykaf [Thu, 14 Jan 2021 15:01:14 +0000 (16:01 +0100)]
Linting.

3 years agoPbkdf2: Use it everywhere.
Lain Soykaf [Thu, 14 Jan 2021 14:06:16 +0000 (15:06 +0100)]
Pbkdf2: Use it everywhere.

3 years agoPassword -> Password.Pbkdf2
Lain Soykaf [Thu, 14 Jan 2021 13:49:39 +0000 (14:49 +0100)]
Password -> Password.Pbkdf2

3 years agoUnnecessary duplication here
Mark Felder [Wed, 13 Jan 2021 18:01:01 +0000 (12:01 -0600)]
Unnecessary duplication here

3 years agoConsistent style
Mark Felder [Wed, 13 Jan 2021 18:00:48 +0000 (12:00 -0600)]
Consistent style

3 years agoNot needed in test.exs
Mark Felder [Wed, 13 Jan 2021 17:54:45 +0000 (11:54 -0600)]
Not needed in test.exs

3 years agotruncated_namespace should default to nil
Mark Felder [Wed, 13 Jan 2021 17:54:00 +0000 (11:54 -0600)]
truncated_namespace should default to nil

3 years agoLinting
Lain Soykaf [Wed, 13 Jan 2021 15:00:12 +0000 (16:00 +0100)]
Linting

3 years agoPassword: Replace Pbkdf2 with Password.
lain [Wed, 13 Jan 2021 14:11:11 +0000 (15:11 +0100)]
Password: Replace Pbkdf2 with Password.

3 years agoPassword: Add password module
lain [Wed, 13 Jan 2021 14:09:01 +0000 (15:09 +0100)]
Password: Add password module

Replaces Pbkdf2.

3 years agoMerge branch 'chores/bump-copyright' into 'develop'
Haelwenn [Wed, 13 Jan 2021 06:55:12 +0000 (06:55 +0000)]
Merge branch 'chores/bump-copyright' into 'develop'

Bump Copyright to 2021

See merge request pleroma/pleroma!3252

3 years agoCOPYING: Bump copyright to 2021
Haelwenn (lanodan) Monnier [Wed, 13 Jan 2021 06:53:44 +0000 (07:53 +0100)]
COPYING: Bump copyright to 2021

3 years agoBump Copyright to 2021
Haelwenn (lanodan) Monnier [Wed, 13 Jan 2021 06:49:20 +0000 (07:49 +0100)]
Bump Copyright to 2021

grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'

3 years agoSwitch another test to Upload.base_url/0
Mark Felder [Tue, 12 Jan 2021 22:42:43 +0000 (16:42 -0600)]
Switch another test to Upload.base_url/0

3 years agoDocument deprecation
Mark Felder [Tue, 12 Jan 2021 22:40:29 +0000 (16:40 -0600)]
Document deprecation

3 years agoFix tests relying on old behavior. Use the Upload.base_url, Luke.
Mark Felder [Tue, 12 Jan 2021 22:35:10 +0000 (16:35 -0600)]
Fix tests relying on old behavior. Use the Upload.base_url, Luke.

3 years agoProvide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess...
Mark Felder [Tue, 12 Jan 2021 22:34:24 +0000 (16:34 -0600)]
Provide a non-nil fallback for Upload.base_url/0 for tests using TestUploaderSuccess as the uploader

3 years agoFix another ad-hoc construction of the upload base_url
Mark Felder [Tue, 12 Jan 2021 22:32:52 +0000 (16:32 -0600)]
Fix another ad-hoc construction of the upload base_url

3 years agoDeprecate Pleroma.Uploaders.S3, :public_endpoint
Mark Felder [Tue, 12 Jan 2021 22:31:35 +0000 (16:31 -0600)]
Deprecate Pleroma.Uploaders.S3, :public_endpoint

3 years agoMerge branch 'fix/backup-url-on-s3' into 'develop'
feld [Tue, 12 Jan 2021 20:54:30 +0000 (20:54 +0000)]
Merge branch 'fix/backup-url-on-s3' into 'develop'

Standardize base url for uploads

See merge request pleroma/pleroma!3246

3 years agoMerge branch 'chat-message-pagination' into 'develop'
rinpatch [Tue, 12 Jan 2021 19:30:44 +0000 (19:30 +0000)]
Merge branch 'chat-message-pagination' into 'develop'

ChatMessages: Fix pagination headers.

See merge request pleroma/pleroma!3250

3 years agoPagination: Don't be dos'd by random parameters.
lain [Tue, 12 Jan 2021 11:59:50 +0000 (12:59 +0100)]
Pagination: Don't be dos'd by random parameters.

3 years agoSimplify. We will always have a result from Upload.base_url/0, so just add it to...
Mark Felder [Mon, 11 Jan 2021 20:19:14 +0000 (14:19 -0600)]
Simplify. We will always have a result from Upload.base_url/0, so just add it to the list

3 years agoFix regression in MediaProxy.local?/0 and appending the Upload.base_url to whiteliste...
Mark Felder [Mon, 11 Jan 2021 20:01:31 +0000 (14:01 -0600)]
Fix regression in MediaProxy.local?/0 and appending the Upload.base_url to whitelisted domains

3 years agoChatMessages: Fix pagination headers.
lain [Mon, 11 Jan 2021 14:30:40 +0000 (15:30 +0100)]
ChatMessages: Fix pagination headers.

They used to contain the path parameter `id` as query param,
which would break the link.

3 years agoFormatting
Mark Felder [Sun, 10 Jan 2021 15:03:42 +0000 (09:03 -0600)]
Formatting

3 years agoMerge branch 'feat/format-optional-migrations' into 'develop'
rinpatch [Sun, 10 Jan 2021 08:40:13 +0000 (08:40 +0000)]
Merge branch 'feat/format-optional-migrations' into 'develop'

.formatter.exs: Format optional migrations

See merge request pleroma/pleroma!3249

3 years ago.formatter.exs: Format optional migrations
rinpatch [Sun, 10 Jan 2021 08:28:41 +0000 (11:28 +0300)]
.formatter.exs: Format optional migrations

(There are no changes to optional migrations since they were manually
formatted in https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3207)

3 years agoMerge branch 'add_some_information_about_setting_up_a_development_environment' into...
rinpatch [Sun, 10 Jan 2021 08:25:36 +0000 (08:25 +0000)]
Merge branch 'add_some_information_about_setting_up_a_development_environment' into 'develop'

Add some information about setting up a development environment

Closes #1904

See merge request pleroma/pleroma!3207

3 years agoAdd development section
Ilja [Sun, 10 Jan 2021 08:25:36 +0000 (08:25 +0000)]
Add development section

* I cretaed a folder 'development'
* I split up the file dev.md into three parts and moved it to this folder
  * index.md
  * authentication_authorization.md
  * mrf.md
* I also moved ap_extensions.md
* I created a new file setting_up_pleroma_dev.md

3 years agoApply 4 suggestion(s) to 2 file(s)
feld [Sun, 10 Jan 2021 01:34:54 +0000 (01:34 +0000)]
Apply 4 suggestion(s) to 2 file(s)