e2772d6bf1
Merge branch 'block-behavior' into 'develop'
...
Configurable block visibility, fixes #2123
Closes #2123
See merge request pleroma/pleroma!3242
3 years ago
6b3842cf50
Merge branch 'remove/mastofe' into 'develop'
...
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
3 years ago
ee26f2c91b
Quarantine placeholders
...
* kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case
* The mrf simple and transparency exclusion were already OK
3 years ago
f4028c908c
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
...
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
3 years ago
64002e92ad
config/description.exs: Update quarantine settings to tuples
3 years ago
dc4814f0cd
Fix merge conflicts with upstream
3 years ago
a5dce42c85
Merge branch 'chore/rename-chat' into 'develop'
...
Rename the non-federating Chat feature to Shout
See merge request pleroma/pleroma!2842
3 years ago
679d4c23e9
Update wording for relays in docs and config description
3 years ago
297feb73f4
Formatting
3 years ago
dcf84ac12e
disableChat / disableShout didn't actually do anything for PleromaFE
3 years ago
8ff2d8d17d
Update description file for new shout config setting location
3 years ago
36fe8950f7
Update PleromaFE settings for the old chat box
3 years ago
ff00b354fa
Rename the non-federating Chat feature to Shout
3 years ago
69aed310de
Adding description
3 years ago
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
3 years ago
762be6ce10
Merge remote-tracking branch 'upstream/develop' into block-behavior
3 years ago
fa2e62078c
Remove MastoFE configuration stuff
3 years ago
2557e805a3
Support for configuration via AdminFE
4 years ago
77f3da0358
[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
4 years ago
a98c4423f3
Apply i1t's suggestion(s) to 1 file(s)
4 years ago
b981edad8a
[ #3213 ] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.
4 years ago
349b8b0f4f
[ #3213 ] `rescue` around potentially-raising `Repo.insert_all/_` calls. Misc. improvements (docs etc.).
4 years ago
5992382cf8
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
4 years ago
a996ab46a5
[ #3213 ] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
4 years ago
a52cedba62
Merge branch 'chore/descriptions-improvements' into 'develop'
...
More descriptions improvements
See merge request pleroma/pleroma!3307
4 years ago
ce7c275fb3
Improve various descriptions and labels
4 years ago
2bffa8e020
Make the suggestion match the default value
4 years ago
4dbb08a19f
Improved Mailer descriptions
4 years ago
d1c6dd97aa
[ #3213 ] Partially addressed code review points.
...
migration rollback task changes, hashtags-related config handling tweaks, `hashtags.data` deletion (unused).
4 years ago
f736501e97
Alpha-sort adapters
...
Add various labels, descriptions and suggestions for all adapter settings and try to use
the same terminology by the service provider.
4 years ago
0fcf16dcb8
Move Enabled to top as it's the master control of all email. Description not really needed.
4 years ago
bd828e5c9c
More description improvements
4 years ago
227dd84f11
Update SMTP error description and default value
4 years ago
9e3e8e2e30
Update Swoosh docs URL, lint
4 years ago
cfc474c5f7
There is no reason to expose these Local adapter settings either.
4 years ago
6ffe15cc9f
Remove No MX lookups setting
...
This setting defaults to false so the relay host will be used in an MX query so
multiple SMTP servers can be used. gen_smtp code states that all records returned from the
MX query are attempted in order and only a permanent SMTP error will stop the client from
attempting other servers in the list. Connection failures, TLS issues, etc will cause it to
try the next host.
If there is no MX record associated with the relay host, it automatically tries connecting to it
directly.
There is really no reason to expose this to end users. The default value is fine for everyone.
4 years ago
85710b026f
Improve SMTP adapter setting descriptions
4 years ago
9f98885388
No reason to suggest users try the useless "Local" mail adapter
4 years ago
1b49b8efe5
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
6fd4163ab6
[ #3213 ] ActivityPub: implemented subqueries-based hashtags filtering, removed aggregation-based hashtags filtering.
4 years ago
9948ff3356
[ #3213 ] Added HashtagsCleanupWorker periodic job.
4 years ago
2048b93929
Add missing :ex_aws, :s3, :region setting
4 years ago
d7af0294e6
Merge branch 'service-worker-allowed-header' into 'develop'
...
Ability to set custom HTTP headers per each frontend
See merge request pleroma/pleroma!3247
4 years ago
e709dec2eb
Add Invalidation Script url_format setting
4 years ago
7fcaa188a0
Allow to define custom HTTP headers per each frontend
4 years ago
133644dfa2
Ability to set the Service-Worker-Allowed header
4 years ago
c041e9c630
[ #3213 ] HashtagsTableMigrator: failures handling fix, retry function.
...
Changed default hashtags filtering strategy to non-aggregate approach.
4 years ago
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
4 years ago
6d48144a9d
use proper naming
...
for MediaProxyWarmingPolicy in ConcurrentLimiter
4 years ago
b4ff63d020
configurable limits for ConcurrentLimiter
...
Pleroma.Web.RichMedia.Helpers & Pleroma.Web.MediaProxy
4 years ago
lain