Commit graph

131 commits

Author SHA1 Message Date
kaniini
3dc5f04976 Merge branch 'carrot-bullying' into 'develop'
Add some hard limits on inserted activities.

See merge request pleroma/pleroma!595
2018-12-29 11:46:06 +00:00
lambda
9c782e59dd Raise remote limit 2018-12-28 18:57:50 +00:00
lain
1dd71026a1 Add 'about' to restricted list.
And correct pleromaFE config.
2018-12-26 14:51:51 +01:00
lain
8da2c45c27 Add ~ to the list of restricted names. 2018-12-26 14:16:41 +01:00
lain
5811e65e67 Add some hard limits on inserted activities. 2018-12-26 12:39:35 +01:00
lain
91724d160a Reserve a few user names
These are all names that are used for domain.com/:route routes or projected to be.
2018-12-25 20:10:45 +01:00
Karen Konou
c76179419d Renamed the things 2018-12-23 11:14:29 +01:00
Karen Konou
409ff60bf8 Fix formatting 2018-12-22 23:32:38 +01:00
Karen Konou
92362e1e22 Implement large thread filter 2018-12-22 23:18:31 +01:00
lambda
443d59baa0 Merge branch 'feature/new-user-routes' into 'develop'
Use "~" as a route namespace symbol on FE

See merge request pleroma/pleroma!530
2018-12-18 15:42:07 +00:00
href
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.
2018-12-17 22:50:59 +01:00
lambda
52ac7dce5c Merge branch 'captcha' into 'develop'
Captcha

See merge request pleroma/pleroma!550
2018-12-17 19:45:14 +00:00
href
77b5154c82
Cowboy handler for Mastodon WebSocket 2018-12-17 17:06:18 +01:00
Ekaterina Vaartis
3a31fdaf06 Change minutes_retained config to seconds_retained 2018-12-16 22:40:44 +03:00
Ekaterina Vaartis
1d31fd0722 Make the hosted kocaptcha the default value 2018-12-16 22:37:16 +03:00
Ekaterina Vaartis
6062885df6 Add a configurable auto-cleanup for captchas 2018-12-16 22:08:17 +03:00
Ekaterina Vaartis
98e10c0d4f Add captcha documentation to config.md 2018-12-15 22:12:20 +03:00
Ekaterina Vaartis
23549d3952 Formatting fixes 2018-12-15 22:08:26 +03:00
Haelwenn (lanodan) Monnier
ff7ce9a9fb
config/config.exs: Add application/jrd+json => jrd+json to fix webfinger
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/551
2018-12-15 15:58:51 +01:00
Ekaterina Vaartis
28c43a417e Add an ability to disabled captcha 2018-12-15 03:12:47 +03:00
Ekaterina Vaartis
a2399c1c7c Add base CAPTCHA support (currently only kocaptcha) 2018-12-15 03:12:44 +03:00
scarlett
213176c3c3 Add new frontend options to server-side config. 2018-12-10 23:15:01 +00:00
Maxim Filippov
09c13d0929 Use "~" as a route namespace symbol on FE 2018-12-10 01:22:50 +03:00
Maksim Pechnikov
3ce16e5a56 init tesla and updated the http requests in Pleroma.Web.Websub 2018-12-04 14:03:32 +03:00
href
680716b3c9
Config docs 2018-11-30 18:02:51 +01:00
href
02d3dc6869
Uploads fun, part. 2 2018-11-30 18:02:37 +01:00
href
b19597f602
reverse proxy / uploads 2018-11-30 18:00:47 +01:00
kaniini
182e3e8da2 Merge branch 'feature/improve-version' into 'develop'
Improved version string

See merge request pleroma/pleroma!467
2018-11-21 16:53:38 +00:00
href
bc5cf2c192
Improved version string 2018-11-20 17:55:03 +01:00
href
bcecdc3ab1
Various runtime configuration fixes 2018-11-19 10:09:24 +01:00
hakabahitoyo
8fd0556c78 better config reading 2018-11-17 18:14:42 +09:00
hakabahitoyo
55abd8482e better config 2018-11-16 20:41:12 +09:00
hakabahitoyo
8e707aba29 format 2018-11-15 15:11:59 +09:00
Hakaba Hitoyo
58af0787be add mdii uploader 2018-11-15 14:19:10 +09:00
William Pitcock
ee5932a504 http security: allow referrer-policy to be configured 2018-11-12 15:14:46 +00:00
William Pitcock
fe67665e19 rename CSPPlug to HTTPSecurityPlug. 2018-11-12 15:08:02 +00:00
William Pitcock
df72978dce csp plug: add support for certificate transparency 2018-11-11 06:55:44 +00:00
William Pitcock
69f5dfcfb3 config: add default parameters for CSPPlug 2018-11-11 06:38:50 +00:00
William Pitcock
234e471289 config: properly configure CORSPlug. 2018-11-11 05:41:23 +00:00
kaniini
a880e0a527 Merge branch 'feature/upload-limits' into 'develop'
configurable media upload limits

Closes #118

See merge request pleroma/pleroma!401
2018-10-29 20:14:10 +00:00
William Pitcock
36825932eb s3 uploader: add new feature to force public attachment URIs to go through media proxy 2018-10-29 18:00:59 +00:00
William Pitcock
167d3789a5 activitypub: upload: pass through an upload limit if one is provided 2018-10-29 16:43:05 +00:00
scarlett
ae5beb7b64 Make finmoji optional 2018-10-25 17:58:46 +01:00
scarlett
3e79d941c8 Defaults for new frontend options in config.exs 2018-10-21 12:54:37 +01:00
Haelwenn (lanodan) Monnier
2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes 2018-10-18 07:58:15 +02:00
William Pitcock
08d5ad71b6 nodeinfo: allow opting out of MRF transparency 2018-10-07 01:23:38 +00:00
William Pitcock
7b3fff9af8 {mastodon api, twitter api}: make the follow handshake timeout configurable 2018-10-07 01:05:59 +00:00
William Pitcock
285ac80c36 config: allow for accepted post formats to be configured 2018-10-05 21:02:17 +00:00
William Pitcock
16307da311 twitterapi: frontend config: add formattingOptionsEnabled 2018-10-05 20:49:34 +00:00
William Pitcock
5acfa2e091 config: pass inline images through mediaproxy (closes #275) 2018-09-16 02:16:17 +00:00