32 Commits (8180de951e2ac1efc6cfb9f64d078d6a1b7d0c0e)

Author	SHA1	Message	Date
href	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
kaniini	dea33f4aec	Merge branch 'develop' into 'develop' ... Clarify the description of the `logo_mask` configuration key. See merge request pleroma/pleroma!747	6 years ago
rinpatch	7057891db6	Make rich media support toggleable	6 years ago
Alice	a0dc95d084	Clarify the description of the `logo_mask` configuration key.	6 years ago
kaniini	bd5086731e	Merge branch 'multiple-hackney-pools' into 'develop' ... Use multiple hackney pools See merge request pleroma/pleroma!739	6 years ago
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.	6 years ago
Haelwenn (lanodan) Monnier	7db517ff06	docs/config.md: Fix syntax, pleroma_fe isn’t an atom	6 years ago
Haelwenn (lanodan) Monnier	aa492af6c2	docs/config.md: Fix typo, provide an example key with camelCase and where to find more ... [ci skip]	6 years ago
kaniini	d03a116654	Merge branch 'hj-happiness-improvement' into 'develop' ... New frontend configuration mechanism. Closes #445 See merge request pleroma/pleroma!700	6 years ago
Ivan Tashkinov	d3f9e6f6fe	[#534] Merged `upstream/develop`.	6 years ago
lain	bcc559e4e6	Update config.md	6 years ago
Ivan Tashkinov	656ed7c84a	[#534] Configurable outgoing federation reachability timeout.	6 years ago
lain	e221c681dc	New frontend configuration mechanism.	6 years ago
rinpatch	74346a7035	Fix merge conflict	6 years ago
Mark Felder	8c368d42a2	Make attachment links configurable ... Thanks @href!	6 years ago
rinpatch	4d5f15cd42	Introduce optional unfurling of nsfw content	6 years ago
rinpatch	bfe2a11a6b	Add config doc	6 years ago
scarlett	9eba6b96dc	Fix spellign.	6 years ago
Egor Kislitsyn	48591aab98	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts ... # Conflicts: # docs/config.md	6 years ago
Egor Kislitsyn	0c750bc432	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts	6 years ago
Egor Kislitsyn	6428ef77ad	add default configuration for the pinned statuses and some doc	6 years ago
lain	0fae04c4e3	Add a setting for users to autofollow on sign up.	6 years ago
Haelwenn (lanodan) Monnier	c9b99d4486	config/config.exs: Add syslog backends	6 years ago
rinpatch	b73a1a33de	Merge branch 'captcha' into 'develop' ... Make captcha (kocaptcha) stateless See merge request pleroma/pleroma!585	6 years ago
lain	1a0391c8a4	Add documentation.	6 years ago
lain	5811e65e67	Add some hard limits on inserted activities.	6 years ago
Karen Konou	c76179419d	Renamed the things	6 years ago
Karen Konou	c92f91ffeb	Add documentation	6 years ago
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	6 years ago
kaniini	2e2030ada8	Merge branch '114_email_confirmation' into 'develop' ... [#114] Email confirmation See merge request pleroma/pleroma!546	6 years ago
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	6 years ago
Haelwenn (lanodan) Monnier	6adea5a7b2	Move to docs	6 years ago