Karen Konou
0ef0ae35ab
added optional delist feature
2019-02-03 20:12:23 +01:00
lain
e61f0be951
Unbreak all the tests.
2019-02-03 18:54:39 +01:00
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
rinpatch
7057891db6
Make rich media support toggleable
2019-01-31 18:18:20 +03:00
Egor Kislitsyn
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
2019-01-31 15:07:49 +07:00
href
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.
2019-01-30 15:06:46 +01:00
kaniini
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
Egor Kislitsyn
55affbca7f
add a job queue
2019-01-28 22:17:17 +07:00
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged upstream/develop.
2019-01-28 15:39:14 +03:00
Ivan Tashkinov
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
2019-01-28 15:25:06 +03:00
lain
39b2457734
Change default bg image in new config.
2019-01-28 13:04:51 +01:00
Ivan Tashkinov
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
2019-01-25 15:10:21 +03:00
lain
e221c681dc
New frontend configuration mechanism.
2019-01-23 12:40:57 +01:00
rinpatch
74346a7035
Fix merge conflict
2019-01-18 18:31:25 +03:00
rinpatch
a38f21f51d
unfurl_nsfw: false by default
2019-01-18 18:30:06 +03:00
Mark Felder
207489aa25
Also add to default config
2019-01-17 15:50:34 +00:00
rinpatch
76f80940da
oops
2019-01-16 17:19:01 +03:00
rinpatch
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
2019-01-15 20:00:21 +03:00
rinpatch
e4dc3f71ae
Resolve merge conflict
2019-01-13 13:38:28 +03:00
kaniini
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
2019-01-10 02:39:53 +00:00
Mark Felder
5419b1a030
Alpha sort the restricted nicknames
2019-01-10 00:06:03 +00:00
Egor Kislitsyn
28afcb7c31
move defaults from sample_config.exs to config.exs
2019-01-09 17:02:30 +07:00
lain
0fae04c4e3
Add a setting for users to autofollow on sign up.
2019-01-08 09:57:53 +01:00
Haelwenn (lanodan) Monnier
c9b99d4486
config/config.exs: Add syslog backends
2019-01-06 01:11:53 +01:00
href
53f56039e5
Remove media proxy examples in config/config.exs
...
1. this was overriding the real defaults
2. it's documented in `config/config.md`
2019-01-03 20:22:22 +01:00
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
2019-01-03 17:04:27 +00:00
rinpatch
9ef664ffce
Merge branch 'fix-chat' into 'develop'
...
Add handler for Phoenix-style socket.
See merge request pleroma/pleroma!619
2019-01-03 08:59:05 +00:00
rinpatch
d1983ed028
Merge branch 'fix/reserve-media-username' into 'develop'
...
Reserve /media
See merge request pleroma/pleroma!620
2019-01-02 16:23:46 +00:00
Rin Toshaka
5142b50f39
reserve /media
2019-01-02 17:16:26 +01:00
lain
8910e103ce
Add handler for Phoenix-style socket.
2019-01-02 11:39:11 +01:00
lain
400337b0a7
Make Federator options configurable.
2019-01-01 14:46:55 +01:00
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
Ekaterina Vaartis
448af3601a
Up captcha timer to 60 secs again, save used captchas in cachex
2018-12-27 00:16:43 +03: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
Ekaterina Vaartis
d112990776
Specifically disable captcha for automatic tests, it makes them fail
2018-12-22 23:07:44 +03:00
Ekaterina Vaartis
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
2018-12-21 09:55:47 +03:00
kaniini
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
2018-12-20 04:01:54 +00:00
raeno
7fb3780431
Merge branch 'develop' into oembed_provider
2018-12-19 22:39:44 +04:00
lain
f3eb414e28
Add a way to use the admin api without a user.
2018-12-18 21:08:52 +01:00
Haelwenn (lanodan) Monnier
6adea5a7b2
Move to docs
2018-12-18 17:16:26 +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
raeno
a300336459
Merge branch 'develop' into oembed_provider
2018-12-18 14:59:32 +01: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
b12a904911
Integration tests for mastodon websocket
2018-12-17 17:09:06 +01:00
href
77b5154c82
Cowboy handler for Mastodon WebSocket
2018-12-17 17:06:18 +01:00
vaartis
6e2f64a0a6
minutes->seconds_retained in config.md
2018-12-17 06:41:41 +00: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
Rin Toshaka
7c522f38f0
Enable unsecure cookies by default in dev.exs
2018-12-16 08:49:23 +01:00
Ekaterina Vaartis
c859cd1d61
Fix style
2018-12-15 23:39:23 +03:00
Ekaterina Vaartis
e8537208bd
Add a captcha mock for tests
2018-12-15 22:38:39 +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
href
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
2018-12-14 20:22:24 +00:00
raeno
90b00701ff
Merge branch 'develop' into oembed_provider
2018-12-14 20:28:35 +01:00
Haelwenn
ef10e08efe
Update config.md
2018-12-14 15:06:04 +00:00
lambda
3b65f31606
Update config.md
2018-12-14 13:05:44 +01:00
Egor Kislitsyn
658edb166f
fix and improve web push; add configuration docs
2018-12-14 13:05:29 +01:00
Ivan Tashkinov
9666376f5f
[ #114 ] Readded invites_enabled config setting, updated readme.
2018-12-14 12:37:06 +03:00
href
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
2018-12-14 09:16:03 +00:00
Ivan Tashkinov
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
2018-12-14 12:09:55 +03:00
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
2018-12-13 22:34:15 +01:00
raeno
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
2018-12-13 22:17:53 +01:00
href
7214d57463
Extended nicknames: allow dashes.
2018-12-12 21:48:54 +01:00
href
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
2018-12-12 18:57:33 +01:00
Ivan Tashkinov
4e7d98922e
[ #114 ] Added tests for "POST /api/account/password_reset".
2018-12-12 17:04:52 +03:00
Ivan Tashkinov
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
2018-12-12 17:02:41 +03:00
Ivan Tashkinov
10c156d98f
[ #114 ] SMTP deps and config.
2018-12-12 17:01:34 +03:00
scarlett
e1cbb18327
Document the new frontend options.
2018-12-10 23:23:10 +00:00
scarlett
213176c3c3
Add new frontend options to server-side config.
2018-12-10 23:15:01 +00:00
lambda
729321ad20
Merge branch 'fix/config-md-typos' into 'develop'
...
config.md: Fix typos and add `federating` option description
See merge request pleroma/pleroma!525
2018-12-10 19:06:13 +00:00
Maxim Filippov
09c13d0929
Use "~" as a route namespace symbol on FE
2018-12-10 01:22:50 +03:00
Rin Toshaka
100a06afe1
config.md: Fix typos and add option description
2018-12-09 11:09:21 +01:00
href
f079ca7181
Remove french.
2018-12-08 11:09:35 +01:00
href
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
2018-12-07 14:07:11 +01:00
kaniini
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
2018-12-06 15:36:41 +00:00
Egor Kislitsyn
0020b22688
add VAPID to test config
2018-12-06 20:17:00 +07:00
scarlett
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
2018-12-04 23:35:07 +00:00
Maksim Pechnikov
ec34de0c1f
WebSub fix test
2018-12-04 14:03:32 +03:00
Maksim Pechnikov
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
2018-12-04 14:03:32 +03:00
rinpatch
d9a4aed3b3
replace try/catch with File.Exists? in dev.exs
2018-12-01 17:38:45 +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
Haelwenn (lanodan) Monnier
761ed2355f
config/prod.exs: Remove server: true
...
This breaks mix tasks in regular Elixir
2018-11-30 03:05:34 +01:00
William Pitcock
6979eeda34
config: document mrf_user_allowlist
2018-11-26 23:54:46 +00: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
5dda13ee5f
config docs: typo fix
2018-11-11 07:27:36 +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
Haelwenn (lanodan) Monnier
d1a7a9fd24
config/config.md: Add lines inspired/copied from CONFIGURATION.md
2018-11-10 13:09:38 +01:00
Haelwenn (lanodan) Monnier
db67c9b118
config/config.md: scope_options_enabled also addresses subject
2018-11-10 13:09:38 +01:00
Haelwenn (lanodan) Monnier
79bdc3db19
config/config.md: Fill all the blanks
2018-11-10 13:09:37 +01:00
Haelwenn (lanodan) Monnier
0189ccd4d9
config/config.md: Complete it [WIP]
2018-11-10 13:09:37 +01:00
Haelwenn (lanodan) Monnier
ee41dbeca5
config/config.md: Create
2018-11-10 13:09:37 +01: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
William Pitcock
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
2018-09-16 01:25:36 +00:00
William Pitcock
358f88e10a
html: allow inline images by default (because of custom emoji)
2018-09-10 00:24:19 +00:00
William Pitcock
40e2f6e500
html: add default scrubbing profile and configuration knobs
2018-09-10 00:14:57 +00:00
William Pitcock
255f46d7ab
html: new module providing a configurable markup scrubbing policy
2018-09-10 00:13:57 +00:00
Hakaba Hitoyo
4e1bb7bccb
make limit for /api/v1/suggestions
2018-09-09 13:57:23 +09:00
kaniini
530561a091
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
...
Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302
2018-09-07 23:55:42 +00:00
Haelwenn (lanodan) Monnier
754deb26dd
[Pleroma.Uploaders.Local]: Add configuration for custom url path
...
One use-case being an external caching proxy
2018-09-02 19:00:16 +02:00
William Pitcock
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
2018-09-01 21:05:32 +00:00
William Pitcock
de5bd6fc65
config: fix up defaults for s3 endpoint configuration
2018-08-31 04:43:15 +00:00
William Pitcock
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
2018-08-31 04:01:21 +00:00
Thurloat
8d2d7a8859
Implement uploader behaviour
...
run formatter <#
2018-08-28 09:57:41 -03:00
Thurloat
0df558a6a5
cleaning up a bit.
2018-08-27 22:45:53 -03:00
Thurloat
709816a0f8
example of flexible storage backends
2018-08-27 22:20:54 -03:00
William Pitcock
e95d958b52
sample config: show how amazon s3 support is activated, including third-party clones like wasabi
2018-08-27 23:30:53 +00:00
shibayashi
b9a642da1e
Add Secure and SameSite cookie flags
2018-08-28 00:40:58 +02:00
kaniini
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
hakabahitoyo
89e2cb0828
remove unused settings
2018-08-26 17:21:57 +09:00
William Pitcock
09cb402203
fe config: add collapse_message_with_subject fe option
2018-08-24 18:21:42 +00:00
kaniini
183ccd1812
Merge branch 'dev-lanodan-url-regex' into 'develop'
...
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
2018-08-16 15:41:16 +00:00
lambda
9908cf8fda
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
...
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
2018-08-15 07:47:33 +00:00
William Pitcock
7bed350a23
config: allow relaying to be disabled
2018-08-06 08:22:10 +00:00
Hakaba Hitoyo
f72cfada1a
add suggestions/web config
2018-08-02 18:03:35 +09:00
Haelwenn (lanodan) Monnier
d5091c3175
Allow additionnal schemes in the config
2018-08-01 02:52:42 +02:00
