akkoma
3 years agoMerge branch 'bugfix/notice-external-redirect' into 'develop'
Haelwenn [Thu, 4 Feb 2021 14:26:03 +0000 (14:26 +0000)]
Merge branch 'bugfix/notice-external-redirect' into 'develop'

Redirect non-local activities when /notice/:id is used

See merge request pleroma/pleroma!3300

3 years agoRedirect non-local activities when /notice/:id is used
Haelwenn (lanodan) Monnier [Wed, 3 Feb 2021 16:53:09 +0000 (17:53 +0100)]
Redirect non-local activities when /notice/:id is used

Related-to: https://git.pleroma.social/pleroma/pleroma/-/issues/2496
3 years agoMerge branch 'chore/external-emoji-example' into 'develop'
Haelwenn [Thu, 4 Feb 2021 14:05:30 +0000 (14:05 +0000)]
Merge branch 'chore/external-emoji-example' into 'develop'

Stop external emoji example from leaking

See merge request pleroma/pleroma!3302

3 years agoLoad an emoji.txt specific to the test env
Mark Felder [Wed, 3 Feb 2021 22:36:45 +0000 (16:36 -0600)]
Load an emoji.txt specific to the test env

3 years agoMerge branch 'fix/openapi-relationship-nullable' into 'develop'
rinpatch [Wed, 3 Feb 2021 15:14:40 +0000 (15:14 +0000)]
Merge branch 'fix/openapi-relationship-nullable' into 'develop'

Account schema: specify that pleroma.relationship is nullable

See merge request pleroma/pleroma!3299

3 years agoAccount schema: specify that pleroma.relationship is nullable
rinpatch [Wed, 3 Feb 2021 15:10:43 +0000 (18:10 +0300)]
Account schema: specify that pleroma.relationship is nullable

3 years agoMerge branch 'fix/deploy-api-docs-2-electric-boogalo' into 'develop'
rinpatch [Wed, 3 Feb 2021 15:01:08 +0000 (15:01 +0000)]
Merge branch 'fix/deploy-api-docs-2-electric-boogalo' into 'develop'

CI: Forgot $ in spec-deploy

See merge request pleroma/pleroma!3298

3 years agoCI: Forgot $ in spec-deploy
rinpatch [Wed, 3 Feb 2021 15:00:04 +0000 (18:00 +0300)]
CI: Forgot $ in spec-deploy

3 years agoMerge branch 'fix/2412-filters' into 'develop'
feld [Wed, 3 Feb 2021 14:36:35 +0000 (14:36 +0000)]
Merge branch 'fix/2412-filters' into 'develop'

Support for expires_in/expires_at in filters

Closes #2412

See merge request pleroma/pleroma!3279

3 years agoMerge branch 'develop' into 'fix/2412-filters'
feld [Wed, 3 Feb 2021 14:23:23 +0000 (14:23 +0000)]
Merge branch 'develop' into 'fix/2412-filters'

# Conflicts:
#   CHANGELOG.md

3 years agoMerge branch 'fix/2449-scheduled-poll-bug' into 'develop'
feld [Wed, 3 Feb 2021 14:22:23 +0000 (14:22 +0000)]
Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'

Fix for scheduled post with poll

Closes #2449

See merge request pleroma/pleroma!3294

3 years agoMerge branch 'feature/2438-users-posts-total-count' into 'develop'
feld [Wed, 3 Feb 2021 14:21:57 +0000 (14:21 +0000)]
Merge branch 'feature/2438-users-posts-total-count' into 'develop'

Feature/2438 users/instances posts total count

Closes #2438

See merge request pleroma/pleroma!3270

3 years agoMerge branch 'fix/deploy-api-docs' into 'develop'
rinpatch [Wed, 3 Feb 2021 14:03:24 +0000 (14:03 +0000)]
Merge branch 'fix/deploy-api-docs' into 'develop'

CI: Add job ref when calling api docs builder

See merge request pleroma/pleroma!3297

3 years agoCI: Add job ref when calling api docs builder
rinpatch [Wed, 3 Feb 2021 14:02:01 +0000 (17:02 +0300)]
CI: Add job ref when calling api docs builder

Just grabbing the latest artifact for the branch does not work because
gitlab will only change the latest artifact when the whole pipeline
finishes

3 years agoMerge branch 'feat/openapi-spec-export' into 'develop'
rinpatch [Wed, 3 Feb 2021 13:21:19 +0000 (13:21 +0000)]
Merge branch 'feat/openapi-spec-export' into 'develop'

Improve OpenAPI spec and deploy it to api.pleroma.social

See merge request pleroma/pleroma!3296

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 'a1batross-develop-patch-62810' into 'develop'
feld [Tue, 2 Feb 2021 18:37:20 +0000 (18:37 +0000)]
Merge branch 'a1batross-develop-patch-62810' into 'develop'

mix: instance: ensure all needed folders are created before generating config

See merge request pleroma/pleroma!3284

3 years agoMerge branch 'email-stub-in-verify-credentials' into 'develop'
feld [Tue, 2 Feb 2021 18:35:08 +0000 (18:35 +0000)]
Merge branch 'email-stub-in-verify-credentials' into 'develop'

Email-like field in /api/v1/accounts/verify_credentials (for PeerTube OAuth plugin and alike)

See merge request pleroma/pleroma!3286

3 years agoMerge branch 'develop' into a1batross-develop-patch-62810
Mark Felder [Tue, 2 Feb 2021 18:18:03 +0000 (12:18 -0600)]
Merge branch 'develop' into a1batross-develop-patch-62810

3 years agoMerge branch 'develop' into a1batross-develop-patch-62810
Mark Felder [Tue, 2 Feb 2021 18:16:49 +0000 (12:16 -0600)]
Merge branch 'develop' into a1batross-develop-patch-62810

3 years agoMix pleroma.instance creates parent directories now
Mark Felder [Tue, 2 Feb 2021 18:16:01 +0000 (12:16 -0600)]
Mix pleroma.instance creates parent directories now

3 years agoMerge branch 'fix/majic-nits' into 'develop'
feld [Tue, 2 Feb 2021 18:15:00 +0000 (18:15 +0000)]
Merge branch 'fix/majic-nits' into 'develop'

Majic: don't fix extensions

See merge request pleroma/pleroma!3287

3 years agoDocument OAuth 2.0 provider fqn field addition
Mark Felder [Tue, 2 Feb 2021 18:12:37 +0000 (12:12 -0600)]
Document OAuth 2.0 provider fqn field addition

3 years agoMerge branch 'fix/2411-mutes-api' into 'develop'
feld [Tue, 2 Feb 2021 18:08:46 +0000 (18:08 +0000)]
Merge branch 'fix/2411-mutes-api' into 'develop'

Support for with_relationships parameter

Closes #2411

See merge request pleroma/pleroma!3290

3 years agoDocument we are disabling the extension fixup in Majic
Mark Felder [Tue, 2 Feb 2021 18:03:20 +0000 (12:03 -0600)]
Document we are disabling the extension fixup in Majic

3 years agoMerge branch 'develop' into fix/majic-nits
Mark Felder [Tue, 2 Feb 2021 18:01:48 +0000 (12:01 -0600)]
Merge branch 'develop' into fix/majic-nits

3 years agoMerge branch 'develop' into 'fix/2411-mutes-api'
feld [Tue, 2 Feb 2021 17:57:58 +0000 (17:57 +0000)]
Merge branch 'develop' into 'fix/2411-mutes-api'

# Conflicts:
#   CHANGELOG.md
#   docs/development/API/differences_in_mastoapi_responses.md

3 years agoMerge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'
feld [Tue, 2 Feb 2021 17:22:23 +0000 (17:22 +0000)]
Merge branch 'fix/2473-purge-expired-activities-duplicates' into 'develop'

fix and delete purge activities duplicates

Closes #2473

See merge request pleroma/pleroma!3285

3 years agoMerge branch 'feature/2164-unify-api-arguments' into 'develop'
feld [Tue, 2 Feb 2021 17:18:07 +0000 (17:18 +0000)]
Merge branch 'feature/2164-unify-api-arguments' into 'develop'

Unifying timelines api arguments

Closes #2164

See merge request pleroma/pleroma!3281

3 years agoImprove changelog description
Mark Felder [Tue, 2 Feb 2021 17:15:47 +0000 (11:15 -0600)]
Improve changelog description

3 years agoMerge branch 'develop' into 'feature/2164-unify-api-arguments'
feld [Tue, 2 Feb 2021 17:11:38 +0000 (17:11 +0000)]
Merge branch 'develop' into 'feature/2164-unify-api-arguments'

# Conflicts:
#   CHANGELOG.md

3 years agoMerge branch 'fix/attachment-cleanup' into 'develop'
feld [Tue, 2 Feb 2021 17:08:33 +0000 (17:08 +0000)]
Merge branch 'fix/attachment-cleanup' into 'develop'

Only run attachment cleanup if enabled

See merge request pleroma/pleroma!3288

3 years agoMerge branch 'active-user-count' into 'develop'
feld [Tue, 2 Feb 2021 17:07:57 +0000 (17:07 +0000)]
Merge branch 'active-user-count' into 'develop'

Monthly Active Users

Closes #2332

See merge request pleroma/pleroma!3283

3 years agofix for test warnings
Alexander Strizhakov [Mon, 1 Feb 2021 16:33:40 +0000 (19:33 +0300)]
fix for test warnings

3 years agofix for scheduled post with poll
Alexander Strizhakov [Mon, 1 Feb 2021 15:22:26 +0000 (18:22 +0300)]
fix for scheduled post with poll

3 years agoonly_remote -> remote renaming
Alexander Strizhakov [Mon, 1 Feb 2021 11:09:23 +0000 (14:09 +0300)]
only_remote -> remote renaming

3 years ago`/api/v1/accounts/:id/statuses` docs update
Alexander Strizhakov [Tue, 26 Jan 2021 14:55:43 +0000 (17:55 +0300)]
`/api/v1/accounts/:id/statuses` docs update

3 years agomore tests and update for docs and changelog
Alexander Strizhakov [Tue, 26 Jan 2021 14:43:49 +0000 (17:43 +0300)]
more tests and update for docs and changelog

3 years agolist timeline filtration by params
Alexander Strizhakov [Tue, 26 Jan 2021 13:55:44 +0000 (16:55 +0300)]
list timeline filtration by params

3 years agoonly_media & only_remote docs and changelog
Alexander Strizhakov [Tue, 26 Jan 2021 11:42:03 +0000 (14:42 +0300)]
only_media & only_remote docs and changelog

3 years agoadded only_media flag to home timeline
Alexander Strizhakov [Tue, 26 Jan 2021 11:35:31 +0000 (14:35 +0300)]
added only_media flag to home timeline

3 years agoexpanding filtration for home timeline
Alexander Strizhakov [Tue, 26 Jan 2021 08:58:54 +0000 (11:58 +0300)]
expanding filtration for home timeline

added local & remote statuses filtration for home timeline

3 years agoMerge branch 'update-frontend-2021-02-01' into 'develop'
rinpatch [Mon, 1 Feb 2021 10:32:14 +0000 (10:32 +0000)]
Merge branch 'update-frontend-2021-02-01' into 'develop'

Update frontend

Closes #2493

See merge request pleroma/pleroma!3293

3 years agoUpdate frontend
Lain Soykaf [Mon, 1 Feb 2021 09:12:05 +0000 (10:12 +0100)]
Update frontend

3 years agoMerge branch 'emoji-cache' into 'develop'
feld [Sat, 30 Jan 2021 17:41:08 +0000 (17:41 +0000)]
Merge branch 'emoji-cache' into 'develop'

Emoji cache

Closes #2468

See merge request pleroma/pleroma!3291

3 years agoMerge branch 'fix/configdb-missing-s3-region' into 'develop'
feld [Fri, 29 Jan 2021 17:44:46 +0000 (17:44 +0000)]
Merge branch 'fix/configdb-missing-s3-region' into 'develop'

ConfigDB descriptions: Add missing :ex_aws, :s3, :region setting

See merge request pleroma/pleroma!3292

3 years agoAdd missing :ex_aws, :s3, :region setting
Mark Felder [Fri, 29 Jan 2021 17:31:15 +0000 (11:31 -0600)]
Add missing :ex_aws, :s3, :region setting

3 years ago[#3286] Documentation on configuring Pleroma as OAuth 2.0 provider.
Ivan Tashkinov [Fri, 29 Jan 2021 13:36:25 +0000 (16:36 +0300)]
[#3286] Documentation on configuring Pleroma as OAuth 2.0 provider.

3 years agolike this
Alexander Strizhakov [Fri, 29 Jan 2021 12:24:22 +0000 (15:24 +0300)]
like this

3 years agosupport for with_relationships parameter
Alexander Strizhakov [Fri, 29 Jan 2021 05:41:21 +0000 (08:41 +0300)]
support for with_relationships parameter

in /api/v1/mutes and /api/v1/accounts/:id endpoints

3 years agoMake attachment cleanup jobs a noop if the setting is disabled.
Mark Felder [Thu, 28 Jan 2021 20:42:20 +0000 (14:42 -0600)]
Make attachment cleanup jobs a noop if the setting is disabled.

3 years agoSwitch to a build of Majic that does not try to fix extensions by default
Mark Felder [Thu, 28 Jan 2021 20:03:29 +0000 (14:03 -0600)]
Switch to a build of Majic that does not try to fix extensions by default

3 years agoMake sure active_user_count/1 counts only local users
Egor Kislitsyn [Thu, 28 Jan 2021 18:23:10 +0000 (22:23 +0400)]
Make sure active_user_count/1 counts only local users

3 years agoEmail-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins...
Ivan Tashkinov [Thu, 28 Jan 2021 16:49:43 +0000 (19:49 +0300)]
Email-like field in /api/v1/accounts/verify_credentials response (for OAuth plugins like Peertube).
Addresses https://git.pleroma.social/pleroma/pleroma-support/-/issues/56.

3 years agochangelog entry
Alexander Strizhakov [Thu, 28 Jan 2021 14:01:31 +0000 (17:01 +0300)]
changelog entry

3 years agofix and delete purge activities duplicates
Alexander Strizhakov [Thu, 28 Jan 2021 13:50:21 +0000 (16:50 +0300)]
fix and delete purge activities duplicates

3 years agofix for unique oban worker option
Alexander Strizhakov [Thu, 28 Jan 2021 13:57:03 +0000 (16:57 +0300)]
fix for unique oban worker option

3 years agofix format
Alibek Omarov [Thu, 28 Jan 2021 10:20:25 +0000 (10:20 +0000)]
fix format

3 years agomix: instance: ensure all needed folders are created before generating config
Alibek Omarov [Thu, 28 Jan 2021 09:39:53 +0000 (09:39 +0000)]
mix: instance: ensure all needed folders are created before generating config

3 years agocache headers for emoji and images
Alexander Strizhakov [Wed, 27 Jan 2021 15:49:08 +0000 (18:49 +0300)]
cache headers for emoji and images

3 years agoUpdate CHANGELOG
Egor Kislitsyn [Wed, 27 Jan 2021 14:23:46 +0000 (18:23 +0400)]
Update CHANGELOG

3 years agoAdd tests
Egor Kislitsyn [Wed, 27 Jan 2021 14:18:46 +0000 (18:18 +0400)]
Add tests

3 years agoAdd active user count
Egor Kislitsyn [Fri, 22 Jan 2021 20:37:49 +0000 (00:37 +0400)]
Add active user count

3 years agoMerge branch 'chore/tests-use-clear_config' into 'develop'
lain [Wed, 27 Jan 2021 11:33:27 +0000 (11:33 +0000)]
Merge branch 'chore/tests-use-clear_config' into 'develop'

Convert tests to all use clear_config instead of Pleroma.Config.put

See merge request pleroma/pleroma!3282

3 years agoadded total
Alexander Strizhakov [Thu, 21 Jan 2021 16:17:37 +0000 (19:17 +0300)]
added total

to the instance adminAPI endpoint

3 years agoadded total
Alexander Strizhakov [Thu, 21 Jan 2021 15:51:21 +0000 (18:51 +0300)]
added total

to the user statuses adminAPI endpoint

3 years agoMerge branch 'service-worker-allowed-header' into 'develop'
feld [Tue, 26 Jan 2021 18:14:01 +0000 (18:14 +0000)]
Merge branch 'service-worker-allowed-header' into 'develop'

Ability to set custom HTTP headers per each frontend

See merge request pleroma/pleroma!3247

3 years agoConvert tests to all use clear_config instead of Pleroma.Config.put
Mark Felder [Tue, 26 Jan 2021 17:58:43 +0000 (11:58 -0600)]
Convert tests to all use clear_config instead of Pleroma.Config.put

3 years agoMerge branch '2435-list-multiple-users' into 'develop'
Haelwenn [Tue, 26 Jan 2021 14:34:50 +0000 (14:34 +0000)]
Merge branch '2435-list-multiple-users' into 'develop'

Resolve "Add/Remove several accounts from List don't work"

Closes #2435

See merge request pleroma/pleroma!3260

3 years agoMerge branch 'develop' into '2435-list-multiple-users'
lain [Tue, 26 Jan 2021 14:24:32 +0000 (14:24 +0000)]
Merge branch 'develop' into '2435-list-multiple-users'

# Conflicts:
#   CHANGELOG.md

3 years agosupport for expires_in/expires_at in filters
Alexander Strizhakov [Mon, 25 Jan 2021 12:34:59 +0000 (15:34 +0300)]
support for expires_in/expires_at in filters

3 years agoMerge branch 'fix/missing-own_votes' into 'develop'
Haelwenn [Tue, 26 Jan 2021 00:55:05 +0000 (00:55 +0000)]
Merge branch 'fix/missing-own_votes' into 'develop'

Include own_votes in the poll data

See merge request pleroma/pleroma!3274

3 years agoMerge branch 'docs/apache-config' into 'develop'
feld [Tue, 26 Jan 2021 00:32:53 +0000 (00:32 +0000)]
Merge branch 'docs/apache-config' into 'develop'

Update Apache configuration

See merge request pleroma/pleroma!3271

3 years agoCredo
Mark Felder [Tue, 26 Jan 2021 00:25:53 +0000 (18:25 -0600)]
Credo

3 years agoClarify the state of mediaproxy cache invalidation for Apache
Mark Felder [Tue, 26 Jan 2021 00:23:05 +0000 (18:23 -0600)]
Clarify the state of mediaproxy cache invalidation for Apache

3 years agoNote the requirement for the url_format parameter
Mark Felder [Tue, 26 Jan 2021 00:20:07 +0000 (18:20 -0600)]
Note the requirement for the url_format parameter

3 years agoAdd sudo rule, remove quoting that breaks the for loop
Mark Felder [Tue, 26 Jan 2021 00:15:04 +0000 (18:15 -0600)]
Add sudo rule, remove quoting that breaks the for loop

3 years agoMerge branch 'develop' into docs/apache-config
Mark Felder [Mon, 25 Jan 2021 23:00:26 +0000 (17:00 -0600)]
Merge branch 'develop' into docs/apache-config

3 years agoMerge branch 'refactor/deactivated_user_field' into 'develop'
feld [Mon, 25 Jan 2021 16:54:57 +0000 (16:54 +0000)]
Merge branch 'refactor/deactivated_user_field' into 'develop'

Change user.deactivated field to user.is_active

See merge request pleroma/pleroma!3073

3 years agoEnsure consistent behavior between pleroma.user activate/deactivate mix tasks
Mark Felder [Mon, 25 Jan 2021 16:48:28 +0000 (10:48 -0600)]
Ensure consistent behavior between pleroma.user activate/deactivate mix tasks

3 years agolittle refactor and tests
Alexander Strizhakov [Mon, 25 Jan 2021 16:46:36 +0000 (19:46 +0300)]
little refactor and tests

for voted & own_votes fields in polls

3 years agoDocument pleroma.user activate mix task
Mark Felder [Mon, 25 Jan 2021 16:38:08 +0000 (10:38 -0600)]
Document pleroma.user activate mix task

3 years agoProvide pleroma.user mix task for both activate and deactivate
Mark Felder [Mon, 25 Jan 2021 16:36:51 +0000 (10:36 -0600)]
Provide pleroma.user mix task for both activate and deactivate

3 years agoDocument removal of toggle_activated
Mark Felder [Mon, 25 Jan 2021 16:05:38 +0000 (10:05 -0600)]
Document removal of toggle_activated

3 years agoUpdate PleromaFE: pleroma-fe@eb2975b64d849af6bdc327dabac34b8e6d952eae
Mark Felder [Mon, 25 Jan 2021 15:50:26 +0000 (09:50 -0600)]
Update PleromaFE: pleroma-fe@eb2975b64d849af6bdc327dabac34b8e6d952eae

3 years agoUpdate AdminFE: admin-fe@8a390584676b27b611d3363eca2a1194d94ed71f
Mark Felder [Mon, 25 Jan 2021 15:45:58 +0000 (09:45 -0600)]
Update AdminFE: admin-fe@8a390584676b27b611d3363eca2a1194d94ed71f

3 years agoMerge branch 'develop' into refactor/deactivated_user_field
Mark Felder [Mon, 25 Jan 2021 15:45:06 +0000 (09:45 -0600)]
Merge branch 'develop' into refactor/deactivated_user_field

3 years agoMerge branch 'fix/minor-doc-fix' into 'develop'
rinpatch [Sat, 23 Jan 2021 19:06:42 +0000 (19:06 +0000)]
Merge branch 'fix/minor-doc-fix' into 'develop'

add missing sudo prefix in some install doc

See merge request pleroma/pleroma!3276

3 years agoadd missing sudo prefix in install doc
𝑓 [Sat, 23 Jan 2021 16:56:11 +0000 (16:56 +0000)]
add missing sudo prefix in install doc

3 years agoInclude own_votes in the poll data
Mark Felder [Fri, 22 Jan 2021 15:47:59 +0000 (09:47 -0600)]
Include own_votes in the poll data

3 years agoMerge branch 'fix/tag-urls' into 'develop'
Haelwenn [Fri, 22 Jan 2021 03:21:26 +0000 (03:21 +0000)]
Merge branch 'fix/tag-urls' into 'develop'

Make tag urls absolute

See merge request pleroma/pleroma!3272

3 years agoMake tag urls absolute
Mark Felder [Thu, 21 Jan 2021 22:49:19 +0000 (16:49 -0600)]
Make tag urls absolute

3 years agoDocument improved Apache support
Mark Felder [Thu, 21 Jan 2021 20:53:38 +0000 (14:53 -0600)]
Document improved Apache support

3 years agoAdd Invalidation Script url_format setting
Mark Felder [Thu, 21 Jan 2021 20:52:02 +0000 (14:52 -0600)]
Add Invalidation Script url_format setting

3 years agoTest URL formatting
Mark Felder [Thu, 21 Jan 2021 20:42:16 +0000 (14:42 -0600)]
Test URL formatting

3 years agoImprove description
Mark Felder [Thu, 21 Jan 2021 20:42:08 +0000 (14:42 -0600)]
Improve description

3 years agorename function
Mark Felder [Thu, 21 Jan 2021 20:41:28 +0000 (14:41 -0600)]
rename function

3 years agoAdd ability to invalidate cache entries for Apache
Mark Felder [Thu, 21 Jan 2021 20:20:13 +0000 (14:20 -0600)]
Add ability to invalidate cache entries for Apache

3 years agoAllow to define custom HTTP headers per each frontend
eugenijm [Thu, 21 Jan 2021 11:58:18 +0000 (14:58 +0300)]
Allow to define custom HTTP headers per each frontend

3 years agoAbility to set the Service-Worker-Allowed header
eugenijm [Fri, 8 Jan 2021 09:06:04 +0000 (12:06 +0300)]
Ability to set the Service-Worker-Allowed header