Ivan Tashkinov
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
5 years ago
Alexander Strizhakov
41c7f34905
short labels and fixes for typos
5 years ago
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
Maksim Pechnikov
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
feld
6cc5341d26
Merge branch 'config/benchmark' into 'develop'
...
Benchmark env uses test database so we should be able to use test.secret.exs
See merge request pleroma/pleroma!2057
5 years ago
Hakaba Hitoyo
0c9c62509d
Remove MDII uploader
5 years ago
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
5 years ago
Alexander Strizhakov
00aff5f78c
syncing new setting to descriptions.exs
5 years ago
Ivan Tashkinov
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
Alexander
0b02040327
little fixes and typos fix
5 years ago
Alexander
cda2c1fc63
fix for subgroup tuple
...
added settings for swoosh adapters local
5 years ago
Alexander
f9d01068cf
suggestions fix
5 years ago
Alexander
4306769671
adapter children
5 years ago
Alex S
2753285b77
config editing through database
5 years ago
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Mark Felder
89243fee8e
Fix captcha time, which was meant to be 5 minutes
5 years ago
Egor Kislitsyn
b012e66e4e
Increase CAPTCHA expiration time to 5 minutes
5 years ago
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
Mark Felder
b7811dfb7b
Instead allow a dedicated benchmark config
5 years ago
Mark Felder
50638525db
Merge branch 'develop' into config/benchmark
5 years ago
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed
5 years ago
Egor Kislitsyn
fc484e5ce6
Add Kocaptcha endpoint to config.exs
5 years ago
Egor Kislitsyn
8d242f52d4
Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha"
...
This reverts commit 82c62c5028
.
5 years ago
Egor Kislitsyn
82c62c5028
Add default endpoint to Pleroma.Captcha.Kocaptcha
5 years ago
Maksim Pechnikov
67cb46e15d
Merge branch 'develop' into issue/1383
5 years ago
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
470a3a678d
Add Kocaptcha endpoint to the test config
5 years ago
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
5 years ago
stwf
63ffa0e3ed
try local sheduling
5 years ago
Mark Felder
df469b4468
Benchmark env uses test database so we should be able to use test.secret.exs
5 years ago
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
Egor Kislitsyn
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
5 years ago
Egor Kislitsyn
ed92784e7c
Set Logger level to :info in prod
5 years ago
Maksim Pechnikov
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
Egor Kislitsyn
a75d4a41e0
Add a test for custom runtime modules
5 years ago
Egor Kislitsyn
157bceeda9
Move runtime configuration from `:instance` to `:modules`
5 years ago
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
5 years ago
Ivan Tashkinov
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
5 years ago
Egor Kislitsyn
48ae3c4347
Add support for custom modules
5 years ago
lain
aa97fe8f17
ChatChannel: Ignore messages that are too long.
5 years ago
Maksim Pechnikov
652cc6ba4b
updated ScheduledActivity
5 years ago
Maksim Pechnikov
b7c449118b
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
d55859f5a4
remove `quantum` package
5 years ago
Maksim Pechnikov
a4f834a687
moved DigestEmail to Oban Periodic jobs
5 years ago
Maksim Pechnikov
c5766a8100
moved ActivityExpiration to Oban Periodic jobs
5 years ago
Maksim Pechnikov
6f202a401b
moved ScheduledActivity to Oban Periodic jobs
5 years ago
Mark Felder
f673e3deef
Default log level for syslog in prod should also be :warn
5 years ago
Maksim Pechnikov
ac3abb5414
moved Pleroma.Stats to Oban Periodic jobs
5 years ago
Maksim Pechnikov
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
5 years ago
Sadposter
d3656c2725
add ability to set a custom user-agent string
5 years ago
rinpatch
dedb1ad5d6
Merge branch 'revert-5c6c3026' into 'develop'
...
Revert "Merge branch 'patch-1' into 'develop'"
See merge request pleroma/pleroma!2002
5 years ago
rinpatch
dc9303eac5
Revert "Merge branch 'patch-1' into 'develop'"
...
This reverts merge request !1829
5 years ago
Mark Felder
edaae845af
Some tasks try to set log level in test environment, but we were stripping logs belog :warn.
...
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
5 years ago
Mark Felder
c65190c799
Console backend's log format should be prefixed and suffixed with newlines.
...
This is how upstream does it by default.
5 years ago
Mark Felder
1c17f18329
Be specific about format for logs in test as we have tests that check it
5 years ago
Mark Felder
cb513a599c
Allow test builds to have info and debug logs stripped
5 years ago
Mark Felder
ff9133b978
Allow mix tasks to always run with debug logging
5 years ago
Ariadne Conill
1d33eeca72
config: add configuration for MRF ObjectAgePolicy
5 years ago
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
5 years ago
lain
72cc92259e
Default config: Use extended nickname format
5 years ago
rinpatch
4499a7a075
Disable attachment links by default
...
Closes #1394
5 years ago
lain
e08bd99bab
Apply suggestion to config/config.exs
5 years ago
lain
4885d403fe
Apply suggestion to config/config.exs
5 years ago
Maksim Pechnikov
9d0b989521
add subject to atom feed
5 years ago
Phil Hagelberg
886a07ba57
Move static_fe config to its own section instead of in :instance.
5 years ago
rinpatch
2f4e9a068f
Bump fast_sanitize to 0.1.1
...
The parser C-Node has been completely rewritten to not use the deprecated
`erl_interface` api.
Closes #1378 since Nodex was ripped out and the replacement randomizes
master node name.
5 years ago
rinpatch
9434e151a9
Blacklist myhtmlex nodes from swarm
5 years ago
rinpatch
05d111b622
Use the default scrubber before mediaproxy transformation
5 years ago
KokaKiwi
638457ba94
MastoFE: Add PWA manifest.
5 years ago
rinpatch
5c6c3026ea
Merge branch 'patch-1' into 'develop'
...
Fix a typo in default static directory configuration for OTP releases
Closes #1289
See merge request pleroma/pleroma!1829
5 years ago
Ariadne Conill
c6de0cbb4a
config: disable Websub and Salmon publisher modules
5 years ago
yalh76
fb5dce481c
Fix https://git.pleroma.social/pleroma/pleroma/issues/1289
5 years ago
lain
ecd7ac855b
Benchmark config: Don't use the sql sandbox.
5 years ago
lain
2629493804
Benchmark config: Database adjustments.
5 years ago
lain
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
lain
02f8e2a8ab
Gitlab: Run benchmark in CI.
5 years ago
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
5 years ago
Ivan Tashkinov
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
Mark Felder
b8b98ac40f
Add missing extended_nickname_format setting to the default config
5 years ago
Ivan Tashkinov
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
minibikini
f9380289eb
Add `remote_ip` plug
5 years ago
kaniini
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
5 years ago
Rachel Fae Fox
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
5 years ago
Egor Kislitsyn
d639cdcecb
Update "config/description.exs"
5 years ago
Egor Kislitsyn
cf3041220a
Add support for `rel="ugc"`
5 years ago
Ekaterina Vaartis
3e972c0456
Add :shared_pack_cache_seconds_per_file to description.exs
5 years ago
Ekaterina Vaartis
ee620ecbf1
Add caching for emoji pack sharing
5 years ago
Ekaterina Vaartis
7e4c8b56ea
Add tests for emoji pack sharing
5 years ago
Haelwenn (lanodan) Monnier
32d64102cb
description.exs: uncomment type for email logo
5 years ago
Haelwenn (lanodan) Monnier
c0c5628200
description.exs: remove empty strings on descriptions
5 years ago
Haelwenn (lanodan) Monnier
50ec445b2c
description.exs: remove empty strings and arrays
5 years ago
Haelwenn (lanodan) Monnier
35dcea3e13
Remove [true,false] for booleans, it is implicit
5 years ago
Ivan Tashkinov
e7afb67c5c
[ #1260 ] Rate-limiting for create authentication and related requests.
5 years ago
Egor Kislitsyn
d6ab78e610
Set `account_field_value_length` limit to 2048 by default
5 years ago
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd33126
, reversing
changes made to 4fabf83ad0
.
5 years ago
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
Steven Fuchs
aab264db82
Streamer refactoring
5 years ago
Ivan Tashkinov
e127b9ab6d
[ #1149 ] Rewritten readme as config/description.exs.
5 years ago
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
rinpatch
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
5 years ago
rinpatch
56828abf6d
Use Jason for rendering responses
...
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59)
)
5 years ago
Alex S
e47089cf55
web_cache_ttl description
5 years ago
Alex S
10827eecad
formatting
5 years ago
Alexander Strizhakov
5db2920644
Apply suggestion to config/description.exs
5 years ago
Alexander Strizhakov
65bc9e66ad
Apply suggestion to config/description.exs
5 years ago
Alex S
6721301086
some changes
5 years ago
Alex S
171cefd889
description.exs
5 years ago
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
5 years ago
Alex S
db690bede9
temp commit
5 years ago
Ivan Tashkinov
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ashlynn Anderson
bd8b92ea5e
Remove dynamic config as default, add healthcheck
5 years ago
Ivan Tashkinov
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
5 years ago
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
Egor Kislitsyn
66c1966688
Disable rate limiter by default
5 years ago
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Ivan Tashkinov
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
aries
e5f76a54e6
Fix default config of account fields length
5 years ago
Ivan Tashkinov
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
Ivan Tashkinov
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
Ivan Tashkinov
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
5 years ago
lain
f740d786a3
Merge branch 'rate-limit-ap-routes' into 'develop'
...
[#1174 ] Rate limit AP routes
See merge request pleroma/pleroma!1586
5 years ago
Egor Kislitsyn
8d899d6197
Add `:ap_routes` rate limit
5 years ago
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
5 years ago
Egor Kislitsyn
158231cd20
Add configurable colors and logo for the digest template
5 years ago
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Egor Kislitsyn
a2e1db5632
Increase max account fields limits
5 years ago
Egor Kislitsyn
e457fcc479
Add `:max_remote_account_fields` config option
5 years ago
Egor Kislitsyn
2c35d4b0b0
Add configurable account field name length limit
5 years ago
Egor Kislitsyn
db3c05f6b4
Add configurable account field value length limit
5 years ago
Egor Kislitsyn
e0ac5c7a66
Add custom profile fields
5 years ago
rinpatch
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
5 years ago
rinpatch
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
5 years ago
Ariadne Conill
3fdbeb7087
MRF: add vocabulary policy module
5 years ago
Ariadne Conill
f46cd7e9c7
config: remove legacy activitypub accept_blocks setting
...
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
5 years ago
Ivan Tashkinov
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
5 years ago
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
Hakaba Hitoyo
39c7bbe18f
Remove longfox emoji set
5 years ago
Ashlynn Anderson
4007717534
Run mix format
5 years ago
Ashlynn Anderson
4a418698db
Create docker.exs and docker-entrypoint + round out Dockerfile
...
At this point, the implementation is completely working and has been
tested running live and federating with other instances.
5 years ago
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
Ivan Tashkinov
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
5 years ago
Egor Kislitsyn
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
5 years ago
rinpatch
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
5 years ago
Sachin Joshi
242f5c585e
add account confirmation email resend in mastodon api
5 years ago
Mike Verdone
378f5f0fbe
Add activity expiration worker
...
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
5 years ago
Mike Verdone
b729402774
Make test.exs read config in the same way as dev.exs
...
This way, if your test.secret.exs has an error, you'll actually see it.
5 years ago
rinpatch
196cad46f3
Resolve merge conflicts
5 years ago
Roman Chvanikov
36049f08ef
Merge develop
5 years ago
kaniini
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
5 years ago
Ariadne Conill
1345e0c2bf
tests: add tests for signed object fetches
5 years ago
Ariadne Conill
b2a8ccf37f
config: add sign_object_fetches option
5 years ago
Alexander Strizhakov
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
5 years ago
Sachin Joshi
18234cc44e
add the rich media ttl based on image exp time
5 years ago
Ivan Tashkinov
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
5 years ago
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
Alex S
f4447d82b8
parsers configurable
5 years ago
Ariadne Conill
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
5 years ago
rinpatch
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
5 years ago
kaniini
f4c001062e
Merge branch '1041-status-actions-rate-limit' into 'develop'
...
Rate-limited status actions (per user and per user+status).
Closes #1041
See merge request pleroma/pleroma!1410
5 years ago
Ivan Tashkinov
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
5 years ago
rinpatch
fa7e0c4262
Workaround for remote server certificate chain issues
5 years ago
Roman Chvanikov
eae991b06a
merge develop
5 years ago
Eugenij
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
5 years ago
Alex S
59e16fc45a
enable synchronization by default
5 years ago
Alex S
beba7bbc85
removing synchronization worker
5 years ago
Maksim
12b1454245
[ #1062 ] added option to disable send email
5 years ago
Roman Chvanikov
371d39e160
Merge develop
5 years ago
Alexander Strizhakov
d6b0fce6e9
Fix/1019 correct count remote users
5 years ago
Alexander Strizhakov
4e6e5d8042
reverse proxy tests
5 years ago
Haelwenn
1ab4e35f27
Merge branch 'enable-ogp-by-default' into 'develop'
...
Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes #1034
See merge request pleroma/pleroma!1388
5 years ago
Haelwenn
95c085174d
Merge branch 'test-speedup' into 'develop'
...
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
5 years ago
lain
abe2e8881f
Testing: Don't federate in testing.
5 years ago
rinpatch
682f1897b7
Enable OpenGraph and TwitterCard by default
...
Closes #1034
5 years ago
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
5 years ago
Roman Chvanikov
657277ffc0
Resolve conflicts
5 years ago
Mark Felder
f8ec3e129f
In my experience syslog tags are usually lowercase
5 years ago
kaniini
9f8e645dce
Merge branch 'feature/configurable-pack-extensions' into 'develop'
...
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
5 years ago
rinpatch
41e4752950
Make default pack extensions configurable and default to png and gif
5 years ago
Maksim Pechnikov
4ad15ad2a9
add ignore hosts and TLDs for rich_media
5 years ago
rinpatch
875100de01
Bind to 127.0.0.1 instead of 0.0.0.0 by default
5 years ago
Alexander Strizhakov
32320c1ee9
Fixes for dynamic configuration
5 years ago
rinpatch
f30a3241d2
Deps: Update auto_linker
5 years ago
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
Egor Kislitsyn
ce823fa88e
Fix rate limit test
5 years ago
rinpatch
ac3d43e620
Set instance static/uploads to be outside of application directory in release config
...
In case of releases the application directory changes with each version
so the contents will not be accessible
5 years ago
lain
822a9f28d0
Merge branch 'release-config-import' into 'develop'
...
Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing
See merge request pleroma/pleroma!1269
5 years ago
rinpatch
f0d96534a4
Import release config from env variable or /etc/pleroma/config.exs and
...
warn if the file is missing
5 years ago
Egor Kislitsyn
6f29865d43
Add option to restrict all users to local content
5 years ago
Hakaba Hitoyo
5d5a9a3a35
Better default parameters for suggestion
5 years ago
lain
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
5 years ago
Egor Kislitsyn
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
5 years ago
Egor Kislitsyn
bc8f059367
Add rate limiting for search endpoints
5 years ago
kaniini
e343e4ff91
Merge branch 'change-containment-default' into 'develop'
...
Configuration: Skip thread containment by default
See merge request pleroma/pleroma!1256
5 years ago
rinpatch
3ecfe2a6d4
Merge branch 'develop' into feature/releases
5 years ago
rinpatch
b6d2db42a7
Fix wrong placement of serve_endpoints
5 years ago
rinpatch
4f5149c93b
Set default loglevel to `warn` in prod
...
It's rare that info logs are needed to debug the issue, so I would
suggest setting them to warn in prod by default to make finding the
relevant parts easier and potentially even decrease cpu usage on bigger
instances
Closes #962
5 years ago