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
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
28c43a417e
Add an ability to disabled captcha
6 years ago
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
ef10e08efe
Update config.md
6 years ago
3b65f31606
Update config.md
6 years ago
658edb166f
fix and improve web push; add configuration docs
6 years ago
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
6 years ago
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
6 years ago
7214d57463
Extended nicknames: allow dashes.
6 years ago
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
6 years ago
4e7d98922e
[ #114 ] Added tests for "POST /api/account/password_reset".
6 years ago
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
10c156d98f
[ #114 ] SMTP deps and config.
6 years ago
e1cbb18327
Document the new frontend options.
6 years ago
213176c3c3
Add new frontend options to server-side config.
6 years ago
729321ad20
Merge branch 'fix/config-md-typos' into 'develop'
...
config.md: Fix typos and add `federating` option description
See merge request pleroma/pleroma!525
6 years ago
09c13d0929
Use "~" as a route namespace symbol on FE
6 years ago
100a06afe1
config.md: Fix typos and add option description
6 years ago
f079ca7181
Remove french.
6 years ago
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
6 years ago
b0adea30b3
Merge branch 're-mrf' into 'develop'
...
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
6 years ago
0020b22688
add VAPID to test config
6 years ago
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
6 years ago
ec34de0c1f
WebSub fix test
6 years ago
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
6 years ago
d9a4aed3b3
replace try/catch with File.Exists? in dev.exs
6 years ago
680716b3c9
Config docs
6 years ago
02d3dc6869
Uploads fun, part. 2
6 years ago
b19597f602
reverse proxy / uploads
6 years ago
761ed2355f
config/prod.exs: Remove server: true
...
This breaks mix tasks in regular Elixir
6 years ago
6979eeda34
config: document mrf_user_allowlist
6 years ago
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
6 years ago
bc5cf2c192
Improved version string
6 years ago
bcecdc3ab1
Various runtime configuration fixes
6 years ago
8fd0556c78
better config reading
6 years ago
55abd8482e
better config
6 years ago
8e707aba29
format
6 years ago
58af0787be
add mdii uploader
6 years ago
ee5932a504
http security: allow referrer-policy to be configured
6 years ago
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
6 years ago
5dda13ee5f
config docs: typo fix
6 years ago
df72978dce
csp plug: add support for certificate transparency
6 years ago
69f5dfcfb3
config: add default parameters for CSPPlug
6 years ago
234e471289
config: properly configure CORSPlug.
6 years ago
d1a7a9fd24
config/config.md: Add lines inspired/copied from CONFIGURATION.md
6 years ago
db67c9b118
config/config.md: scope_options_enabled also addresses subject
6 years ago
79bdc3db19
config/config.md: Fill all the blanks
6 years ago
0189ccd4d9
config/config.md: Complete it [WIP]
6 years ago
ee41dbeca5
config/config.md: Create
6 years ago
a880e0a527
Merge branch 'feature/upload-limits' into 'develop'
...
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
6 years ago
36825932eb
s3 uploader: add new feature to force public attachment URIs to go through media proxy
6 years ago
167d3789a5
activitypub: upload: pass through an upload limit if one is provided
6 years ago
ae5beb7b64
Make finmoji optional
6 years ago
3e79d941c8
Defaults for new frontend options in config.exs
6 years ago
2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
6 years ago
08d5ad71b6
nodeinfo: allow opting out of MRF transparency
6 years ago
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
285ac80c36
config: allow for accepted post formats to be configured
6 years ago
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
6 years ago
5acfa2e091
config: pass inline images through mediaproxy ( closes #275 )
6 years ago
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
6 years ago
358f88e10a
html: allow inline images by default (because of custom emoji)
6 years ago
40e2f6e500
html: add default scrubbing profile and configuration knobs
6 years ago
255f46d7ab
html: new module providing a configurable markup scrubbing policy
6 years ago
4e1bb7bccb
make limit for /api/v1/suggestions
6 years ago
530561a091
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
...
Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302
6 years ago
754deb26dd
[Pleroma.Uploaders.Local]: Add configuration for custom url path
...
One use-case being an external caching proxy
6 years ago
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
6 years ago
de5bd6fc65
config: fix up defaults for s3 endpoint configuration
6 years ago
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
6 years ago
8d2d7a8859
Implement uploader behaviour
...
run formatter <#
6 years ago
0df558a6a5
cleaning up a bit.
6 years ago
709816a0f8
example of flexible storage backends
6 years ago
e95d958b52
sample config: show how amazon s3 support is activated, including third-party clones like wasabi
6 years ago
b9a642da1e
Add Secure and SameSite cookie flags
6 years ago
Haelwenn (lanodan) Monnier