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
6adea5a7b2
Move to docs
6 years ago
443d59baa0
Merge branch 'feature/new-user-routes' into 'develop'
...
Use "~" as a route namespace symbol on FE
See merge request pleroma/pleroma!530
6 years ago
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
6 years ago
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
b12a904911
Integration tests for mastodon websocket
6 years ago
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
6e2f64a0a6
minutes->seconds_retained in config.md
6 years ago
3a31fdaf06
Change minutes_retained config to seconds_retained
6 years ago
1d31fd0722
Make the hosted kocaptcha the default value
6 years ago
6062885df6
Add a configurable auto-cleanup for captchas
6 years ago
7c522f38f0
Enable unsecure cookies by default in dev.exs
6 years ago
c859cd1d61
Fix style
6 years ago
e8537208bd
Add a captcha mock for tests
6 years ago
98e10c0d4f
Add captcha documentation to config.md
6 years ago
23549d3952
Formatting fixes
6 years ago
ff7ce9a9fb
config/config.exs: Add application/jrd+json => jrd+json to fix webfinger
...
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/551
6 years ago
rinpatch