33a19c002a
Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix
3 years ago
94db0b7cd6
Add activity+json to Phoenix :format_encoders
...
Fixes ErrorView rendering
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
d6432a65da
Move shout configuration from :instance, update docs and changelog
3 years ago
36fe8950f7
Update PleromaFE settings for the old chat box
3 years ago
68aa56b9e4
Just call it shout
3 years ago
ff00b354fa
Rename the non-federating Chat feature to Shout
3 years ago
69aed310de
Adding description
3 years ago
a833a2d76b
Merge branch 'plug-runtime-dev' into 'develop'
...
Put Plugs in runtime mode in :dev, :test to speed up recompilation
See merge request pleroma/pleroma!3411
3 years ago
fe40f6f291
Switch from the deprecated "use Mix.config" to "import Config"
3 years ago
0461794375
Merge remote-tracking branch 'pleroma/develop' into plug-runtime-dev
3 years ago
e3173a279d
Put Plugs in runtime mode in :dev, :test to speed up recompilation
3 years ago
32ae8f4906
Merge remote-tracking branch 'pleroma/develop' into optional-config
3 years ago
b22f54eb29
Make prod.secret.exs optional (with warning)
3 years ago
2557e805a3
Support for configuration via AdminFE
4 years ago
8b81d62227
Upstream original followbot implementation
4 years ago
f930e83fa2
Merge branch 'fix/remove_auto_nsfw' into 'develop'
...
Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223
4 years ago
882dd46843
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
4 years ago
3bc7d12271
Remove sensitive-property setting #nsfw, create HashtagPolicy
4 years ago
8f88a90ca3
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
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
db7d6f337f
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
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
6d66fadea7
Remove `:auth, :enforce_oauth_admin_scope_usage`
...
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
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
887db076b5
Load an emoji.txt specific to the test env
4 years ago
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
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
Alex Gleason