46200d8fac
Merge branch 'fix-tlsv1.3' into 'develop'
...
Fix supported TLS versions as TLS 1.3 support seems buggy.
Closes #708
See merge request pleroma/pleroma!892
6 years ago
5021b7836f
Fetch user's outbox posts on first federation with that user
6 years ago
bc7570c282
[ #647 ] tests for web push
6 years ago
a283a1fcd0
Add default config for masto_fe
...
Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
6 years ago
b57913b13a
Fix supported TLS versions as TLS 1.3 support seems buggy.
6 years ago
6b2a1ad1c8
config: fix chat endpoint path
6 years ago
9aec00d711
config: update config for cowboy 2 endpoints
6 years ago
c3ac9424d2
AutoLinker
6 years ago
bff9eb5ef7
Reports
6 years ago
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
6 years ago
d812a347ca
Add optional welcome message.
6 years ago
d943c90249
Add tests, change default config values, fix a bug
6 years ago
71ce564ecc
config/dev.exs: Don’t put secure cookies on dev
6 years ago
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
6 years ago
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
6 years ago
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
6 years ago
2174f6eb4f
Add default config for keyword policy
6 years ago
43b3f9e96e
rids the duplicate timestamp from default ExSyslogger config
6 years ago
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
6 years ago
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
6 years ago
0ef0ae35ab
added optional delist feature
6 years ago
e61f0be951
Unbreak all the tests.
6 years ago
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
7057891db6
Make rich media support toggleable
6 years ago
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
4aff4efa8d
Use multiple hackney pools
...
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
6 years ago
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
55affbca7f
add a job queue
6 years ago
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
39b2457734
Change default bg image in new config.
6 years ago
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
6 years ago
e221c681dc
New frontend configuration mechanism.
6 years ago
74346a7035
Fix merge conflict
6 years ago
a38f21f51d
unfurl_nsfw: false by default
6 years ago
207489aa25
Also add to default config
6 years ago
76f80940da
oops
6 years ago
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
6 years ago
e4dc3f71ae
Resolve merge conflict
6 years ago
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
6 years ago
5419b1a030
Alpha sort the restricted nicknames
6 years ago
28afcb7c31
move defaults from sample_config.exs to config.exs
6 years ago
0fae04c4e3
Add a setting for users to autofollow on sign up.
6 years ago
c9b99d4486
config/config.exs: Add syslog backends
6 years ago
53f56039e5
Remove media proxy examples in config/config.exs
...
1. this was overriding the real defaults
2. it's documented in `config/config.md`
6 years ago
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
9ef664ffce
Merge branch 'fix-chat' into 'develop'
...
Add handler for Phoenix-style socket.
See merge request pleroma/pleroma!619
6 years ago
d1983ed028
Merge branch 'fix/reserve-media-username' into 'develop'
...
Reserve /media
See merge request pleroma/pleroma!620
6 years ago
5142b50f39
reserve /media
6 years ago
8910e103ce
Add handler for Phoenix-style socket.
6 years ago
kaniini