71ce564ecc
config/dev.exs: Don’t put secure cookies on dev
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
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
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
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
400337b0a7
Make Federator options configurable.
6 years ago
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
9c782e59dd
Raise remote limit
6 years ago
448af3601a
Up captcha timer to 60 secs again, save used captchas in cachex
6 years ago
1dd71026a1
Add 'about' to restricted list.
...
And correct pleromaFE config.
6 years ago
8da2c45c27
Add ~ to the list of restricted names.
6 years ago
5811e65e67
Add some hard limits on inserted activities.
6 years ago
91724d160a
Reserve a few user names
...
These are all names that are used for domain.com/:route routes or projected to be.
6 years ago
c76179419d
Renamed the things
6 years ago
409ff60bf8
Fix formatting
6 years ago
92362e1e22
Implement large thread filter
6 years ago
d112990776
Specifically disable captcha for automatic tests, it makes them fail
6 years ago
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
6 years ago
fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
6 years ago
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
Haelwenn (lanodan) Monnier