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
lain
39b2457734
Change default bg image in new config.
2019-01-28 13:04:51 +01: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
