3078e62488
Update Apache configuration. This has been tested.
2021-01-21 12:25:18 -06:00
d8860eaee4
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
2021-01-21 14:59:51 +00:00
lain
ba40af054c
Merge branch 'test-cases-mox-setup' into 'develop'
...
Mox mode setup tweak; refactoring
See merge request pleroma/pleroma!3263
2021-01-21 09:03:26 +00:00
Alexander Strizhakov
5ade430e46
changed naming in changelog
2021-01-21 10:13:02 +03:00
Alexander Strizhakov
6d48144a9d
use proper naming
...
for MediaProxyWarmingPolicy in ConcurrentLimiter
2021-01-21 09:50:18 +03:00
dece31a031
Update docs
2021-01-21 09:47:22 +03:00
1537a4f0ad
Document ConcurrentLimiter for RichMedia and MediaProxy
2021-01-21 09:47:22 +03:00
Alexander Strizhakov
b4ff63d020
configurable limits for ConcurrentLimiter
...
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
2021-01-21 09:47:21 +03:00
b5899fda1a
Merge branch 'copyright-fun' into 'develop'
...
Mix aliases for handling copyright headers
See merge request pleroma/pleroma!3257
2021-01-20 22:51:56 +00:00
2926713fe5
Merge branch 'deprecate-public_endpoint' into 'develop'
...
Deprecate Uploaders.S3, :public_endpoint
See merge request pleroma/pleroma!3251
2021-01-20 22:48:48 +00:00
086100e3b7
Consistent comment style for :ex_aws
2021-01-20 16:39:39 -06:00
9988d9261c
Add bucket_namespace to be extra certain truncated_namespace works
2021-01-20 16:33:00 -06:00
2905df841b
Merge branch 'update/oban' into 'develop'
...
Update Oban to 2.3.4
See merge request pleroma/pleroma!3256
2021-01-20 20:32:23 +00:00
Haelwenn
91f74418b7
Merge branch 'fix/active-user-query' into 'develop'
...
Active users must be confirmed, and other related fixes
See merge request pleroma/pleroma!3267
2021-01-20 20:07:30 +00:00
dfc4cb6ebd
Special handling for unconfirmed users based on instance config no longer needed.
2021-01-20 11:30:29 -06:00
5d344e5c79
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
2021-01-20 11:26:14 -06:00
3cb4d40ebf
This scenario no longer exists. Users are auto-confirmed if confirmation not required at time of registration.
2021-01-20 11:17:13 -06:00
704eef3c2d
Special handling for unconfirmed users based on instance config no longer needed.
2021-01-20 11:14:15 -06:00
Alexander Strizhakov
87c468f009
use correct versions for oban migrations
2021-01-20 20:07:24 +03:00
e759579f97
Active users must be confirmed
2021-01-19 16:39:55 -06:00
lain
3802718f80
Merge branch 'update-changelog-reblog-fix' into 'develop'
...
Add Reblog fix to CHANGELOG
See merge request pleroma/pleroma!3266
2021-01-19 14:08:18 +00:00
Egor Kislitsyn
695dabb5da
Add Reblog fix to CHANGELOG
2021-01-19 17:57:00 +04:00
lain
740f40af30
Merge branch 'feat/improved-postgres-tuning-docs' into 'develop'
...
Improve PostgreSQL optimization article
See merge request pleroma/pleroma!3265
2021-01-19 11:36:56 +00:00
rinpatch
e58f45abd6
Improve PostgreSQL optimization article
...
Move query plan mode setting from OTP installation guide and try
to explain what it does.
2021-01-19 14:26:17 +03:00
rinpatch
984426d9c4
Merge branch 'mergeback/2.2.2' into 'develop'
...
Mergeback/2.2.2
See merge request pleroma/pleroma!3264
2021-01-19 10:00:15 +00:00
rinpatch
79bc4bcc3c
Merge branch 'stable' into mergeback/2.2.2
2021-01-19 12:59:24 +03:00
Haelwenn
83ae77ae0c
Merge branch 'weblate-pleroma-pleroma' into 'develop'
...
Translations update from Weblate
See merge request pleroma/pleroma!3262
2021-01-19 02:34:27 +00:00
Ivan Tashkinov
318d6dde1c
Mox mode setup tweak; refactoring.
2021-01-19 00:23:39 +03:00
João Rodrigues
8d1554f08b
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/
2021-01-18 21:19:25 +00:00
João Rodrigues
ca114df523
Added translation using Weblate (Portuguese (Portugal))
2021-01-18 21:19:25 +00:00
958a7f6ed0
Merge branch 'fix/reblog-api' into 'develop'
...
Fix Reblog API
Closes #2423
See merge request pleroma/pleroma!3261
2021-01-18 21:19:14 +00:00
ed84210da3
Merge branch 'refactor/approval_pending_user_field' into 'develop'
...
Change user.approval_pending field to user.is_approved
See merge request pleroma/pleroma!3090
2021-01-18 19:58:30 +00:00
d49387e9d2
Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f
2021-01-18 13:44:59 -06:00
ab32ede102
Document new is_approved attribute
2021-01-18 12:07:37 -06:00
44a86951a3
Merge branch 'develop' into refactor/approval_pending_user_field
2021-01-18 12:05:05 -06:00
0ad6ea2057
Merge branch 'refactor/confirmation_pending_user_field' into 'develop'
...
Change user.confirmation_pending field to user.is_confirmed
See merge request pleroma/pleroma!3081
2021-01-18 17:54:42 +00:00
a9f9fb002c
Document new is_confirmed attribute
2021-01-18 11:31:07 -06:00
096e61fe93
Keep *Breaking* at the top
2021-01-18 11:30:06 -06:00
8a230667cc
Update AdminFE: pleroma/admin-fe@d4c7989f05
2021-01-18 11:25:13 -06:00
Egor Kislitsyn
51d5951c02
Test that only author can reblog a private status
2021-01-18 21:01:00 +04:00
Egor Kislitsyn
1b79dce7bc
Fix Reblog API
...
Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.
2021-01-18 20:15:57 +04:00
rinpatch
c2186a62d5
Merge branch 'release/2.2.2' into 'stable'
...
Release/2.2.2
See merge request pleroma/pleroma!3216
2021-01-18 14:33:28 +00:00
rinpatch
9b68248fd6
pleroma-fe bundle: update to 320418d524a33c20d7d769c8d67a25be81f251ec
2021-01-18 17:08:30 +03:00
rinpatch
207c185dd6
mix.exs: bump version to 2.2.2
2021-01-18 17:08:30 +03:00
rinpatch
605f389038
CHANGELOG.md: Finalize 2.2.2 changelog
2021-01-18 17:08:26 +03:00
lain
3dc04b9aca
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
...
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
2021-01-18 15:28:19 +03:00
lain
732cc0ce46
Merge branch 'fix/changelog-entries' into 'develop'
...
CHANGELOG.md: Remove wrong entries from Unreleased(patch)
See merge request pleroma/pleroma!3258
2021-01-17 13:11:28 +00:00
rinpatch
cbb1174cbd
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
2021-01-17 15:55:33 +03:00
Alexander Strizhakov
197606984d
update for retired elixir_make package version
2021-01-17 15:24:04 +03:00
Alexander Strizhakov
0e48c80d7f
start oban app in migrations and mix tasks
2021-01-17 09:58:41 +03:00
