315 commits

Author	SHA1	Message	Date
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
Tristan Mahé	bc2668bb63	Merge remote-tracking branch 'upstream/develop' into feature/filter_exif	2018-07-19 17:44:18 -07:00
Hakaba Hitoyo	cc9c062b55	merge	2018-07-19 17:42:00 +09:00
Hakaba Hitoyo	b12d17d2ce	configurable timeout	2018-07-18 13:36:20 +09:00
Hakaba Hitoyo	e4dd58307a	better configuration	2018-07-18 09:58:59 +09:00
William Pitcock	2b3f049b06	config: formatting	2018-07-18 00:05:36 +00:00
William Pitcock	b23630076f	TwitterAPI: present pleroma frontend config in API	2018-07-17 15:46:24 +00:00
William Pitcock	cf219b6add	config: make instance description configurable	2018-07-17 15:46:23 +00:00
Hakaba Hitoyo	091b7925d3	debug	2018-07-17 17:20:13 +09:00
Hakaba Hitoyo	d76f0d87be	do nothing if configuration is skipped	2018-07-17 16:45:18 +09:00
hakabahitoyo	e7c580828c	format	2018-07-15 20:36:26 +09:00
hakabahitoyo	f96244006e	change api	2018-07-14 12:07:09 +09:00
hakabahitoyo	127882a5d5	configurable	2018-07-14 11:41:09 +09:00
Tristan Mahé	5469fb9561	Merge remote-tracking branch 'upstream/develop' into feature/filter_exif	2018-07-13 11:14:37 -07:00
Jorty	748fff6544	Fix auto-shortcode emoji ... Emoji were broken due to `Pleroma.Formatter` not knowing about the auto-shortcode emoji. This moves that logic from `Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`. Additionally, it's now possible to specify multiple shortcode globs, and the default globs were changed to `["/emoji/custom/**/*.png"]`, since that's in the .gitignore and the files there would have to be shortcode emoji anyway.	2018-06-30 21:31:08 -04:00
Jorty	c171f9790b	Move emoji glob setting to config.exs ... Also, a bit of formatting, and the glob includes an "/emoji/" prefix to make it more intuitive to users	2018-06-30 17:58:44 -04:00
Tristan Mahé	c67cf8e9af	format...	2018-06-26 13:49:57 -07:00
Tristan Mahé	cb21bf5fc2	filter exif data #187	2018-06-26 13:45:47 -07:00
lambda	dfc96f222c	Merge branch 'feature/configurable-blocks' into 'develop' ... Add more configurability to how blocks work See merge request pleroma/pleroma!203	2018-06-25 06:12:29 +00:00
lambda	92135d00fc	Merge branch 'feature/application-xml-mime' into 'develop' ... config: add application/xml mimetype support. See merge request pleroma/pleroma!228	2018-06-24 13:28:42 +00:00
William Pitcock	60d6038be5	mrf simple: add accept lists ... accept lists supplement reject lists by requiring that any message accepted by contained by the accept list. in other words, this functionality can be used to implement instances similar to awoo.space.	2018-06-19 21:28:24 +00:00
William Pitcock	c5bbc46f87	config: add application/xml mimetype support. ... application/xml is the older xml mimetype. some legacy scripts make use of it, as well as common use for debugging with curl and other tools. so it makes sense to have it alongside text/xml.	2018-06-18 05:41:04 +00:00
squidboi	2e294ee44a	Merge branch 'develop' into feature/configurable-blocks	2018-06-16 15:37:16 -07:00
squidboi	07f0cfa53f	add allow_followersonly and allow_direct options for configuring mrf_rejectnonpublic	2018-06-10 16:40:51 -07:00
squidboi	4f9ecfc77a	formatting	2018-06-09 04:28:11 +00:00
squidboi	b3580b6971	add option to not deny follow if blocked (fixed)	2018-06-08 18:29:41 -07:00
squidboi	e99c73aeba	add option to not deny follow if blocked	2018-06-08 17:47:24 -07:00
squidboi	2847fc8f90	add option to not unfollow on block, and option to not federate outgoing blocks	2018-06-08 17:12:16 -07:00
William Pitcock	09604182d0	add the ability to 'quarantine' an activitypub peer, causing them to be treated as an OStatus peer.	2018-06-07 14:38:09 +00:00
William Pitcock	1c926c7b60	activitypub: allow mastodon S2S block extension support to be disabled	2018-05-26 08:30:41 +00:00
Thog	e55c6f311b	Migrate to comeonin 4 and Cachex 3 ... Also fix some warning in the code and add a missing alias	2018-05-20 20:08:40 +02:00
Mark Felder	737c42920a	Speling	2018-05-04 22:05:01 +00:00
Mark Felder	d30907e573	Make it possible to use custom database connection parameters	2018-05-04 21:00:18 +00:00
lain	a7eb148d61	Optionally deactivate public timelines.	2018-04-25 16:11:07 +02:00
William Pitcock	d24ddd9fb9	ActivityPub MRF: implement the SimplePolicy policy	2018-04-14 06:32:45 -05:00
William Pitcock	4a178b3d65	ActivityPub: implement MRF core hook and baseline noop policy object	2018-04-14 06:32:44 -05:00
lain	cd543d58a1	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop	2018-04-02 13:15:38 +02:00
lain	468e41d50c	Respond to proper ActivityPub type.	2018-04-01 14:58:01 +02:00
William Pitcock	4bf86d4cf5	config: make the upload limit configurable	2018-03-31 19:53:23 -05:00
lain	4e5aa3b3a0	Add gopher server.	2018-03-31 18:12:20 +02:00
lain	4afbef39f4	Format the code.	2018-03-30 15:01:53 +02:00
lain	6dc98aaf89	Clean up prod.exs a bit.	2018-03-28 16:03:42 +02:00
lain	86058c9a88	Return version in instance endpoint, set version to 0.9.0.	2018-03-27 20:09:01 +02:00
lain	fbc187ac15	Switch to Jason for json handling. ... It's twice as fast and will be the standard in the coming ecto.	2018-03-27 16:09:08 +02:00
lain	611ca385de	Merge branch 'develop' into feature/activitypub	2018-03-08 12:37:06 +01:00
lain	0e20d5529a	Add way to disable federation.	2018-03-05 09:26:24 +01:00
lain	13ea3eafe5	Longer header lenght.	2018-02-24 18:33:44 +01:00
Roger Braun	52200998c9	Merge branch 'develop' into feature/activitypub	2018-02-11 09:50:55 +01:00
eal	f0745148a3	Add config option for enabling/disabling chat.	2018-02-03 13:42:37 +02:00
eal	15cb3f2b01	Revert renaming emoji.txt	2018-01-31 23:47:42 +02:00
eal	ab8b9ababa	Split emoji to default and custom.	2018-01-31 16:29:22 +02:00
lambda	2f23ae5b68	Merge branch 'pr-upstream-http-proxy' into 'develop' ... Pr upstream http proxy See merge request pleroma/pleroma!43	2018-01-30 08:16:31 +00:00
Jeff Becker	066fe1a697	use nil instead of empty string	2018-01-29 10:06:16 -05:00
lambda	8db83c3dc0	Merge branch 'feature/longfox' into 'develop' ... add longfox emojis See merge request pleroma/pleroma!53	2018-01-27 11:57:34 +00:00
Hakaba Hitoyo	7e1d4819ca	add longfox emojis	2018-01-27 08:38:48 +09:00
Jeff Becker	dffde6631d	Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy	2018-01-24 13:15:54 -05:00
Hakaba Hitoyo	048f61d7f8	#95 Correct prod.exs	2018-01-14 08:54:28 +00:00
Jeff Becker	658c4754ff	docs	2017-12-30 13:08:43 -05:00
Jeff Becker	5ddd15d794	make httppoison use configurable http proxy	2017-12-30 13:08:36 -05:00
Roger Braun	5599c5920c	Basic incoming AP support.	2017-12-11 10:37:22 +01:00
href	1cb5cbdc6c	Improve error handling, add configuration	2017-11-28 21:44:25 +01:00
Lain Iwakura	44dc694882	Add configuration generation tool, update readme.	2017-11-23 16:22:20 +01:00
Roger Braun	5794558077	Read variable for testing db.	2017-11-02 17:45:33 +01:00
Roger Braun	7c82b82197	Make emoji configurable in files.	2017-09-16 16:49:46 +02:00
Roger Braun	c20530e708	Add configuration option for registrations.	2017-09-15 14:39:32 +02:00
Roger Braun	50409326a8	Refactor posting and make character limit configurable.	2017-09-15 14:17:36 +02:00
Roger Braun	ac2893a945	Add instance config options.	2017-09-15 10:26:28 +02:00
Roger Braun	d982f04a65	Mock HTTPoison in testing.	2017-05-05 14:16:54 +02:00
Roger Braun	1422e7aa84	Handle incoming websub subscriptions.	2017-04-28 15:45:10 +02:00
Roger Braun	8fb73c28bb	Only have one subscription per callback.	2017-04-22 13:44:21 +02:00
Roger Braun	ce6cc84a4a	Add basic webfinger.	2017-04-17 13:44:41 +02:00
Roger Braun	e7dc39e40c	Basic file uploading via TwAPI.	2017-03-29 02:07:56 +02:00
Roger Braun	08fdbd6f3a	Add Uploads.	2017-03-29 01:39:01 +02:00
Roger Braun	e32dbfc9a5	Add basic auth.	2017-03-20 17:56:45 +01:00
Roger Braun	a93f3421a7	Phoenix skeleton	2017-03-17 17:09:58 +01:00