Mark Felder [Tue, 2 Feb 2021 18:18:03 +0000 (12:18 -0600)]
Merge 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
Mark Felder [Tue, 2 Feb 2021 18:16:01 +0000 (12:16 -0600)]
Mix pleroma.instance creates parent directories now
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
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
Mark Felder [Tue, 2 Feb 2021 18:03:20 +0000 (12:03 -0600)]
Document we are disabling the extension fixup in Majic
Mark Felder [Tue, 2 Feb 2021 18:01:48 +0000 (12:01 -0600)]
Merge branch 'develop' into fix/majic-nits
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
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
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
Mark Felder [Tue, 2 Feb 2021 17:15:47 +0000 (11:15 -0600)]
Improve changelog description
feld [Tue, 2 Feb 2021 17:11:38 +0000 (17:11 +0000)]
Merge branch 'develop' into 'feature/2164-unify-api-arguments'
# Conflicts:
# CHANGELOG.md
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
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
Alexander Strizhakov [Mon, 1 Feb 2021 11:09:23 +0000 (14:09 +0300)]
only_remote -> remote renaming
Alexander Strizhakov [Tue, 26 Jan 2021 14:55:43 +0000 (17:55 +0300)]
`/api/v1/accounts/:id/statuses` docs update
Alexander Strizhakov [Tue, 26 Jan 2021 14:43:49 +0000 (17:43 +0300)]
more tests and update for docs and changelog
Alexander Strizhakov [Tue, 26 Jan 2021 13:55:44 +0000 (16:55 +0300)]
list timeline filtration by params
Alexander Strizhakov [Tue, 26 Jan 2021 11:42:03 +0000 (14:42 +0300)]
only_media & only_remote docs and changelog
Alexander Strizhakov [Tue, 26 Jan 2021 11:35:31 +0000 (14:35 +0300)]
added only_media flag to 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
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
Lain Soykaf [Mon, 1 Feb 2021 09:12:05 +0000 (10:12 +0100)]
Update frontend
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
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
Mark Felder [Fri, 29 Jan 2021 17:31:15 +0000 (11:31 -0600)]
Add missing :ex_aws, :s3, :region setting
Alexander Strizhakov [Fri, 29 Jan 2021 12:24:22 +0000 (15:24 +0300)]
like this
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
Mark Felder [Thu, 28 Jan 2021 20:42:20 +0000 (14:42 -0600)]
Make attachment cleanup jobs a noop if the setting is disabled.
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
Egor Kislitsyn [Thu, 28 Jan 2021 18:23:10 +0000 (22:23 +0400)]
Make sure active_user_count/1 counts only local users
Alexander Strizhakov [Thu, 28 Jan 2021 14:01:31 +0000 (17:01 +0300)]
changelog entry
Alexander Strizhakov [Thu, 28 Jan 2021 13:50:21 +0000 (16:50 +0300)]
fix and delete purge activities duplicates
Alibek Omarov [Thu, 28 Jan 2021 10:20:25 +0000 (10:20 +0000)]
fix format
Alibek Omarov [Thu, 28 Jan 2021 09:39:53 +0000 (09:39 +0000)]
mix: instance: ensure all needed folders are created before generating config
Alexander Strizhakov [Wed, 27 Jan 2021 15:49:08 +0000 (18:49 +0300)]
cache headers for emoji and images
Egor Kislitsyn [Wed, 27 Jan 2021 14:23:46 +0000 (18:23 +0400)]
Update CHANGELOG
Egor Kislitsyn [Wed, 27 Jan 2021 14:18:46 +0000 (18:18 +0400)]
Add tests
Egor Kislitsyn [Fri, 22 Jan 2021 20:37:49 +0000 (00:37 +0400)]
Add active user count
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
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
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
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
lain [Tue, 26 Jan 2021 14:24:32 +0000 (14:24 +0000)]
Merge branch 'develop' into '2435-list-multiple-users'
# Conflicts:
# CHANGELOG.md
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
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
Mark Felder [Tue, 26 Jan 2021 00:25:53 +0000 (18:25 -0600)]
Credo
Mark Felder [Tue, 26 Jan 2021 00:23:05 +0000 (18:23 -0600)]
Clarify the state of mediaproxy cache invalidation for Apache
Mark Felder [Tue, 26 Jan 2021 00:20:07 +0000 (18:20 -0600)]
Note the requirement for the url_format parameter
Mark Felder [Tue, 26 Jan 2021 00:15:04 +0000 (18:15 -0600)]
Add sudo rule, remove quoting that breaks the for loop
Mark Felder [Mon, 25 Jan 2021 23:00:26 +0000 (17:00 -0600)]
Merge branch 'develop' into docs/apache-config
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
Mark Felder [Mon, 25 Jan 2021 16:48:28 +0000 (10:48 -0600)]
Ensure consistent behavior between pleroma.user activate/deactivate mix tasks
Alexander Strizhakov [Mon, 25 Jan 2021 16:46:36 +0000 (19:46 +0300)]
little refactor and tests
for voted & own_votes fields in polls
Mark Felder [Mon, 25 Jan 2021 16:38:08 +0000 (10:38 -0600)]
Document pleroma.user activate mix task
Mark Felder [Mon, 25 Jan 2021 16:36:51 +0000 (10:36 -0600)]
Provide pleroma.user mix task for both activate and deactivate
Mark Felder [Mon, 25 Jan 2021 16:05:38 +0000 (10:05 -0600)]
Document removal of toggle_activated
Mark Felder [Mon, 25 Jan 2021 15:50:26 +0000 (09:50 -0600)]
Mark Felder [Mon, 25 Jan 2021 15:45:58 +0000 (09:45 -0600)]
Mark Felder [Mon, 25 Jan 2021 15:45:06 +0000 (09:45 -0600)]
Merge branch 'develop' into refactor/deactivated_user_field
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
𝑓 [Sat, 23 Jan 2021 16:56:11 +0000 (16:56 +0000)]
add missing sudo prefix in install doc
Mark Felder [Fri, 22 Jan 2021 15:47:59 +0000 (09:47 -0600)]
Include own_votes in the poll data
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
Mark Felder [Thu, 21 Jan 2021 22:49:19 +0000 (16:49 -0600)]
Make tag urls absolute
Mark Felder [Thu, 21 Jan 2021 20:53:38 +0000 (14:53 -0600)]
Document improved Apache support
Mark Felder [Thu, 21 Jan 2021 20:52:02 +0000 (14:52 -0600)]
Add Invalidation Script url_format setting
Mark Felder [Thu, 21 Jan 2021 20:42:16 +0000 (14:42 -0600)]
Test URL formatting
Mark Felder [Thu, 21 Jan 2021 20:42:08 +0000 (14:42 -0600)]
Improve description
Mark Felder [Thu, 21 Jan 2021 20:41:28 +0000 (14:41 -0600)]
rename function
Mark Felder [Thu, 21 Jan 2021 20:20:13 +0000 (14:20 -0600)]
Add ability to invalidate cache entries for Apache
eugenijm [Thu, 21 Jan 2021 11:58:18 +0000 (14:58 +0300)]
Allow to define custom HTTP headers per each frontend
eugenijm [Fri, 8 Jan 2021 09:06:04 +0000 (12:06 +0300)]
Ability to set the Service-Worker-Allowed header
Mark Felder [Thu, 21 Jan 2021 18:25:18 +0000 (12:25 -0600)]
Update Apache configuration. This has been tested.
feld [Thu, 21 Jan 2021 14:59:51 +0000 (14:59 +0000)]
Merge branch 'limiter-setup-fix' into 'develop'
Configurable limits for ConcurrentLimiter for Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxyWarmingPolicy
See merge request pleroma/pleroma!3248
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
Alexander Strizhakov [Thu, 21 Jan 2021 07:12:01 +0000 (10:12 +0300)]
changed naming in changelog
Alexander Strizhakov [Thu, 21 Jan 2021 06:50:18 +0000 (09:50 +0300)]
use proper naming
for MediaProxyWarmingPolicy in ConcurrentLimiter
Mark Felder [Wed, 20 Jan 2021 23:07:00 +0000 (17:07 -0600)]
Update docs
Mark Felder [Wed, 20 Jan 2021 23:01:26 +0000 (17:01 -0600)]
Document ConcurrentLimiter for RichMedia and MediaProxy
Alexander Strizhakov [Sat, 9 Jan 2021 15:52:40 +0000 (18:52 +0300)]
configurable limits for ConcurrentLimiter
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
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
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
Mark Felder [Wed, 20 Jan 2021 22:39:39 +0000 (16:39 -0600)]
Consistent comment style for :ex_aws
Mark Felder [Wed, 20 Jan 2021 22:33:00 +0000 (16:33 -0600)]
Add bucket_namespace to be extra certain truncated_namespace works
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
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
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.
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
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.
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.
Alexander Strizhakov [Wed, 20 Jan 2021 17:07:24 +0000 (20:07 +0300)]
use correct versions for oban migrations
Mark Felder [Tue, 19 Jan 2021 22:39:55 +0000 (16:39 -0600)]
Active users must be confirmed
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
Egor Kislitsyn [Tue, 19 Jan 2021 13:57:00 +0000 (17:57 +0400)]
Add Reblog fix to CHANGELOG
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
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.
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
rinpatch [Tue, 19 Jan 2021 09:59:24 +0000 (12:59 +0300)]
Merge branch 'stable' into mergeback/2.2.2
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
projects / akkoma / log