1331 commits

Author	SHA1	Message	Date
Mark Felder	2420d7f439	Spelling/grammar	2020-05-13 16:26:49 -05:00
Mark Felder	4aad764c1d	enableEmojiPicker is not a setting	2020-05-13 16:24:37 -05:00
Mark Felder	2e28b50132	scopeOptionsEnabled has been replaced with minimalScopesMode	2020-05-13 16:23:42 -05:00
Mark Felder	e2c80e62f1	Stickers setting does not exist	2020-05-13 16:19:17 -05:00
Mark Felder	1e48aee50e	Alpha sort FE config descriptions	2020-05-13 16:18:26 -05:00
Mark Felder	1b93581162	Synchronize suggestions with all available static/config.json settings	2020-05-13 16:03:42 -05:00
Ivan Tashkinov	fd2fb2bb2e	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/status_controller.ex # lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex # test/web/mastodon_api/controllers/timeline_controller_test.exs # test/web/mastodon_api/views/status_view_test.exs	2020-05-13 12:42:36 +03:00
Ivan Tashkinov	1b23acf164	[#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments.	2020-05-11 23:21:53 +03:00
Alexander Strizhakov	da6a38d205	copy/paste fix for descriptions	2020-05-11 09:35:20 +03:00
lain	7ca83e71a9	Merge branch 'shortening-modules-name' into 'develop' ... Descriptions that module names are shortened See merge request pleroma/pleroma!2428	2020-05-10 09:05:22 +00:00
Ivan Tashkinov	b0d0d8f91b	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-10 09:17:16 +03:00
Ivan Tashkinov	bbdad85568	Initial implementation of image preview proxy. Media proxy tests refactoring.	2020-05-08 23:06:47 +03:00
Mark Felder	c9344b5f2d	Minor grammar nit	2020-05-08 14:36:59 -05:00
Ivan Tashkinov	b2924ab1fb	Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding	2020-05-08 21:37:55 +03:00
sadposter	e18958a5d7	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-05-08 14:12:33 +01:00
Maksim	3d0c567fbc	Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController	2020-05-07 08:14:54 +00:00
rinpatch	5482a1f6ef	Merge branch 'openapi/validation-plug' into 'develop' ... Ignore unexpected query params and ENUM values Closes #1719 See merge request pleroma/pleroma!2468	2020-05-05 12:08:58 +00:00
Egor Kislitsyn	cc922e7d8c	Document configuration for Pleroma.Web.ApiSpec.CastAndValidate	2020-05-05 15:01:33 +04:00
Egor Kislitsyn	decaa64f75	Merge branch 'develop' into global-status-expiration	2020-05-05 14:28:54 +04:00
feld	b1c29e2de8	Merge branch 'feature/update-labels-for-activating-settings' into 'develop' ... Fix inconsistency in language for activating settings in description.exs Closes admin-fe#108 See merge request pleroma/pleroma!2469	2020-05-04 20:24:08 +00:00
Angelina Filippova	2ab52d5224	Fix inconsistency in language for activating settings	2020-05-04 22:41:14 +03:00
Egor Kislitsyn	1cb89aac1e	Enable strict validation mode in dev and test environments	2020-05-04 22:35:28 +04:00
Egor Kislitsyn	f070b5569c	Add a config option to enable strict validation	2020-05-04 22:33:05 +04:00
Ivan Tashkinov	d5cdc907e3	Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering). ... Added support for :skip_notifications for accounts listing (index.json). Adjusted tests.	2020-05-01 18:45:24 +03:00
Ivan Tashkinov	92efb888c7	Made follow request notifications non-optional (removed config switch).	2020-05-01 09:51:41 +03:00
Alexander Strizhakov	66acfa6882	descriptions that module names are shortened	2020-04-27 10:28:05 +03:00
Egor Kislitsyn	c56c0a3d23	Merge branch 'develop' into global-status-expiration	2020-04-24 18:37:58 +04:00
sadposter	1504211101	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-04-21 00:24:32 +01:00
Egor Kislitsyn	364eecc49f	Merge branch 'develop' into global-status-expiration	2020-04-20 20:37:56 +04:00
Alex Gleason	bedc558809	Merge remote-tracking branch 'upstream/develop' into accept-deletes	2020-04-20 10:15:40 -05:00
Alex Gleason	b54c8813d6	Add :reject_deletes option to SimplePolicy	2020-04-20 10:11:06 -05:00
sadposter	eee32fd993	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-04-18 16:16:27 +01:00
Ivan Tashkinov	6e6f95c6ae	Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications ... # Conflicts: # CHANGELOG.md	2020-04-17 16:23:58 +03:00
Ivan Tashkinov	5c76afb06c	[#2342] Removed description.exs entry for temporary configuration option.	2020-04-13 15:38:50 +03:00
Egor Kislitsyn	7f692343c8	Merge branch 'develop' into global-status-expiration	2020-04-10 14:20:48 +04:00
Ivan Tashkinov	1a4875adfa	[#1559] Support for "follow_request" notifications (configurable). ... (Not currently supported by PleromaFE, thus disabled by default).	2020-04-07 21:52:32 +03:00
sadposter	8cec5796ae	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-04-06 14:44:26 +01:00
Ivan Tashkinov	98b96e45ab	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses ... # Conflicts: # CHANGELOG.md	2020-04-01 20:08:14 +03:00
feld	ef7d2b0f11	Merge branch 'gun' into 'develop' ... Gun adapter Closes #945 See merge request pleroma/pleroma!1861	2020-04-01 17:05:09 +00:00
Ivan Tashkinov	2f2bd7fe72	Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. ... See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.	2020-04-01 19:49:09 +03:00
Alexander Strizhakov	f497cf2f7c	Merge branch 'develop' into gun	2020-03-30 12:15:23 +03:00
Alexander Strizhakov	eb9744cade	activities generation tasks	2020-03-30 11:42:25 +03:00
sadposter	931d663a3a	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-03-29 20:57:38 +01:00
Ivan Tashkinov	012d428e1f	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	2020-03-25 09:05:17 +03:00
Ivan Tashkinov	e743c22329	Fixed incorrect usage of "relations" as a short form of "relationships".	2020-03-25 09:04:00 +03:00
Egor Kislitsyn	80e1571610	Merge branch 'develop' into global-status-expiration	2020-03-20 22:08:34 +04:00
Alexander Strizhakov	9bae9b1b1b	Merge branch 'develop' into gun	2020-03-20 20:47:54 +03:00
Alexander Strizhakov	fe15f0ba15	restrict_unauthenticated setting	2020-03-20 16:36:20 +03:00
Mark Felder	b17d8d305f	Enable Gun adapter by default ... We need devs to dogfood this before we merge it into the 2.1 release	2020-03-16 15:39:34 -05:00
Egor Kislitsyn	421e35b578	Merge branch 'develop' into global-status-expiration	2020-03-16 15:31:31 +04:00
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	2020-03-16 14:25:55 +03:00
Alexander Strizhakov	ba90a6d3e5	removing from descriptions.exs deprecated settings	2020-03-16 14:01:35 +03:00
Haelwenn	d84670b9e1	Merge branch 'f' into 'develop' ... rip out fetch_initial_posts Closes #1422 and #1595 See merge request pleroma/pleroma!2297	2020-03-15 16:14:54 +00:00
rinpatch	e87a32bcd7	rip out fetch_initial_posts ... Every time someone tries to use it, it goes mad and tries to scrape the entire fediverse for no visible reason, it's better to just remove it than continue shipping it in it's current state. idea acked by lain and feld on irc Closes #1595 #1422	2020-03-15 15:59:17 +03:00
rinpatch	fc4496d4fa	rate limiter: disable based on if remote ip was found, not on if the plug was enabled ... The current rate limiter disable logic won't trigger when the remote ip is not forwarded, only when the remoteip plug is not enabled, which is not the case on most instances since it's enabled by default. This changes the behavior to warn and disable when the remote ip was not forwarded, even if the RemoteIP plug is enabled. Also closes #1620	2020-03-13 21:41:17 +03:00
Alexander Strizhakov	b34bc669b9	adding descriptions	2020-03-04 20:09:18 +03:00
Alexander Strizhakov	884d9710b2	refactoring for gun api modules	2020-03-03 19:24:14 +03:00
Alexander Strizhakov	8854770fc4	retry and retry_timeout settings default change	2020-03-03 18:01:35 +03:00
sadposter	3508f698b9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-03-03 11:16:59 +00:00
Alexander Strizhakov	28ed4b41d0	naming for checkin from pool timeout	2020-03-03 13:05:28 +03:00
Alexander Strizhakov	509c81e4b1	Merge branch 'develop' into gun	2020-03-03 10:08:07 +03:00
Egor Kislitsyn	0f386110c6	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-03 00:32:34 +04:00
lain	4c02e04935	Merge branch 'prepared-statements-settings' into 'develop' ... Prepared statements settings See merge request pleroma/pleroma!2238	2020-03-02 17:00:04 +00:00
Alexander Strizhakov	2622cf1190	returning repo parameters	2020-03-02 09:22:34 +03:00
Alexander Strizhakov	d9e4b77f8b	Merge branch 'develop' into gun	2020-03-01 12:48:49 +03:00
rinpatch	ffcebe7e22	timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user	2020-03-01 01:13:08 +03:00
rinpatch	19e559fe51	Merge branch 'rate-limiter-runtime-settings' into 'develop' ... RateLimiter improvements: runtime configurability, no default limits in tests See merge request pleroma/pleroma!2250	2020-02-29 21:52:33 +00:00
Alexander Strizhakov	814b275af7	Merge branch 'develop' into gun	2020-02-29 11:34:50 +03:00
Alexander Strizhakov	04b03e4762	streamer group & Oban crontab child	2020-02-29 11:26:34 +03:00
Steven Fuchs	fabcd82f4a	add confirm field to filtered params	2020-02-28 04:27:50 +00:00
Ivan Tashkinov	6f2efb1c45	Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.	2020-02-27 18:46:05 +03:00
Alexander Strizhakov	2076c9f8c8	unnecessary groups	2020-02-26 19:50:07 +03:00
lain	f71aa644b1	Add :unnamed option to default database configuration	2020-02-25 11:53:30 +01:00
Haelwenn	1e1156b645	Merge branch '1505-threads-federation' into 'develop' ... [#1505] Threads / replies federation Closes #1505 See merge request pleroma/pleroma!2129	2020-02-24 07:28:35 +00:00
Mark Felder	9fe60c3b9c	Add missing invites_enabled and account_activation_required settings	2020-02-22 09:29:05 -06:00
Ivan Tashkinov	8f0ca19b9c	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # CHANGELOG.md # config/config.exs	2020-02-22 09:31:43 +03:00
Egor Kislitsyn	011ede4536	Update documentation	2020-02-21 14:42:43 +04:00
Alexander Strizhakov	a03c420b84	by default don't use gun retries ... remove conn depends on retry setting from config	2020-02-21 12:32:42 +03:00
Alexander Strizhakov	13918cb545	Merge branch 'develop' into gun	2020-02-21 10:02:37 +03:00
Mark Felder	b6bb73f43e	Apply database session parameter to improve GIN full text search	2020-02-20 15:34:10 -06:00
sadposter	fae0d4ba9d	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-02-20 13:50:56 +00:00
Ivan Tashkinov	0d14c3f410	[#1505] Typo fix.	2020-02-20 15:18:28 +03:00
lain	3eddd9caa6	Merge branch 'require-signature' into 'develop' ... Add an option to require fetches to be signed Closes #1444 See merge request pleroma/pleroma!2071	2020-02-20 12:13:21 +00:00
Ivan Tashkinov	0c65a8c3d0	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation ... # Conflicts: # config/config.exs	2020-02-20 15:00:48 +03:00
lain	e0b2de6385	Merge branch 'feature/new-registrations-digest' into 'develop' ... New users digest email Closes #1514 See merge request pleroma/pleroma!2128	2020-02-20 11:58:37 +00:00
Ivan Tashkinov	61d9f43e46	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-18 17:46:09 +03:00
Alexander Strizhakov	514c899275	adding gun adapter	2020-02-18 08:19:01 +03:00
Ivan Tashkinov	269d592181	[#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).	2020-02-15 20:41:38 +03:00
Egor Kislitsyn	0ddcd67d32	Update cheatsheet.md and config/description.exs	2020-02-14 16:53:53 +04:00
Egor Kislitsyn	241a3d744a	Add ActivityExpirationPolicy	2020-02-13 22:27:10 +04:00
Mark Felder	0afff36cda	Formatting got me again	2020-02-13 12:09:11 -06:00
Mark Felder	21dc3e3812	Even more description improvements	2020-02-13 12:01:13 -06:00
Mark Felder	aac7f30eb2	Add missing Oban job for attachments_cleanup	2020-02-13 11:49:19 -06:00
Mark Felder	1c52cf933f	More description cleanup work	2020-02-13 11:45:58 -06:00
Mark Felder	9218f893d7	More description cleanups	2020-02-13 11:31:02 -06:00
feld	b312c36b8e	Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' ... # Conflicts: # config/description.exs	2020-02-13 14:37:55 +00:00
Mark Felder	571a475c7e	Formatting	2020-02-13 08:02:33 -06:00
Mark Felder	9b778dc54a	Formatting	2020-02-13 08:01:39 -06:00
feld	4f5ee26f2d	Update description.exs	2020-02-13 14:00:33 +00:00
feld	e4016f4dbd	Apply suggestion to config/description.exs	2020-02-13 13:59:47 +00:00
Mark Felder	ff9fd4ca89	Fix the confusingly named and inverted logic of "no_attachment_links" ... The setting is now simply "attachment_links" and the boolean value does what you expect. A double negative is never possible and describing the functionality is no longer a philospher's worst nightmare.	2020-02-11 15:39:19 -06:00
Mark Felder	9581d57382	First round at cleaning up descriptions	2020-02-11 15:21:36 -06:00
Egor Kislitsyn	50d9fcbe29	Hotlink logo instead of attachment	2020-02-11 23:33:05 +04:00
feld	237b2068f9	Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" ... This reverts merge request !2194	2020-02-11 16:55:18 +00:00
rinpatch	ea1631d7e6	Make Floki use fast_html	2020-02-11 16:17:21 +03:00
Egor Kislitsyn	6875ccb6bf	Merge branch 'develop' into feature/new-registrations-digest	2020-02-11 13:54:55 +04:00
Alexander Strizhakov	bfd16fe41e	set oban crontab to false in tests	2020-02-11 12:19:06 +03:00
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	2020-02-10 20:49:20 +03:00
sadposter	7de32e2c8b	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-02-09 18:12:40 +00:00
Ivan Tashkinov	4e6bbdc7b5	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-08 19:59:37 +03:00
Ivan Tashkinov	d458f4fdca	[#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.	2020-02-08 19:58:02 +03:00
Alexander Strizhakov	7a2e153a8d	description change	2020-02-06 13:15:23 +03:00
Alexander Strizhakov	bdf0a87be9	dropdown type	2020-02-06 12:50:37 +03:00
feld	b21e59da5f	Merge branch 'remove-linker-scheme-option' into 'develop' ... Remove AutoLinker `scheme` option from the config See merge request pleroma/pleroma!2176	2020-02-05 20:32:45 +00:00
Egor Kislitsyn	3909b5b7b3	Remove AutoLinker scheme option from the config	2020-02-05 21:13:56 +04:00
Ivan Tashkinov	e84fee5b86	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-05 07:56:36 +03:00
Maksim Pechnikov	2c40c8b4a2	Merge branch 'develop' into issue/1383	2020-02-03 21:42:36 +03:00
Roman Chvanikov	8057157ee3	Make attachments cleanup optional	2020-01-31 01:20:37 +03:00
rinpatch	7499805abf	config.exs: Re-enable rate limiter and enable remote ip	2020-01-30 00:06:58 +03:00
sadposter	646016c403	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-01-29 11:05:19 +00:00
Maksim Pechnikov	21a2a05407	Merge branch 'develop' into issue/1383	2020-01-28 20:39:20 +03:00
Hakaba Hitoyo	dabd535e43	Remove user recommendation by third party engine	2020-01-27 13:21:50 +00:00
Alexander Strizhakov	f72727a409	little fixes	2020-01-27 12:53:21 +03:00
Maksim Pechnikov	bfc70fdf29	Merge branch 'develop' into issue/1383	2020-01-27 08:48:19 +03:00
Alexander Strizhakov	5943d78c74	description typos, Oban verbose type fix, new keys	2020-01-25 19:45:51 +03:00
Ivan Tashkinov	86e4d23acb	[#1505] Background fetching of incoming activities' replies collections.	2020-01-25 10:47:30 +03:00
feld	0a5e792454	Merge branch 'fix/better-descriptions-for-email-fields' into 'develop' ... Better descriptions for email fields for admin-fe Closes admin-fe#67 See merge request pleroma/pleroma!2138	2020-01-24 13:54:44 +00:00
Alexander Strizhakov	e9d8a84790	better descriptions for email fields for admin-fe	2020-01-24 11:19:12 +03:00
Alexander Strizhakov	b0ae69d996	removing deleted MDII uploader from suggestions	2020-01-24 11:05:03 +03:00
Egor Kislitsyn	3c4a30c6db	Add NewUsersDigestEmail to config/description.exs	2020-01-23 18:53:11 +04:00
sadposter	4646d3c9d6	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-01-23 11:55:07 +00:00
Mark Felder	e151dea276	Merge branch 'develop' into feature/new-registrations-digest	2020-01-22 15:59:24 -06:00
Ivan Tashkinov	cf96c40057	[#1505] Added Mastodon-compatible replies collection to Note federated representation.	2020-01-22 21:10:17 +03:00
Maksim Pechnikov	cf19bf3c7c	Merge branch 'develop' into issue/1383	2020-01-22 20:20:39 +03:00
Egor Kislitsyn	5c842e3b68	Merge branch 'develop' into feature/new-registrations-digest	2020-01-22 21:18:27 +04:00
Egor Kislitsyn	aa0f0d4edd	Disable NewUsersDigestEmail by default	2020-01-22 20:53:06 +04:00
Egor Kislitsyn	df0b8f1d08	Add new users digest email	2020-01-22 20:31:42 +04:00
Alexander Strizhakov	32a643a159	Merge branch 'develop' into admin-be	2020-01-22 11:22:31 +03:00
Maksim Pechnikov	b8d5c09f48	Merge branch 'develop' into issue/1383	2020-01-22 09:30:30 +03:00
Roman Chvanikov	795a5fe441	Add delete_attachments queue to config	2020-01-21 19:48:14 +03:00
Alexander Strizhakov	f01ab6cd29	some refactor and tests	2020-01-21 18:42:00 +03:00
Alexander Strizhakov	503d966e9f	Merge branch 'develop' into admin-be	2020-01-21 10:32:27 +03:00
Alexander Strizhakov	efb8ef5abe	releases support	2020-01-18 17:14:50 +03:00
Alexander Strizhakov	e699861690	full update for some subkeys	2020-01-18 12:25:56 +03:00
sadposter	4e069ce537	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2020-01-16 16:17:56 +00:00
sadposter	5664427d6c	branch	2020-01-16 16:13:51 +00:00
Ivan Tashkinov	5304c8cd21	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks	2020-01-15 18:12:08 +03:00
Alexander Strizhakov	41c7f34905	short labels and fixes for typos	2020-01-14 15:00:38 +03:00
Alexander Strizhakov	70c7a26de8	Merge branch 'develop' into admin-be	2020-01-14 14:52:00 +03:00
Maksim Pechnikov	b7908844f2	Merge branch 'develop' into issue/1383	2020-01-13 12:41:07 +03:00
feld	6cc5341d26	Merge branch 'config/benchmark' into 'develop' ... Benchmark env uses test database so we should be able to use test.secret.exs See merge request pleroma/pleroma!2057	2020-01-12 18:31:10 +00:00
Hakaba Hitoyo	0c9c62509d	Remove MDII uploader	2020-01-11 17:19:54 +00:00
Alexander Strizhakov	7d128ca208	dynamic_configuration renaming ... and moving it from instance settings	2020-01-10 19:34:19 +03:00
Alexander Strizhakov	00aff5f78c	syncing new setting to descriptions.exs	2020-01-10 17:54:54 +03:00
Ivan Tashkinov	39ce894a07	Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks ... # Conflicts: # lib/pleroma/user.ex	2020-01-10 16:18:32 +03:00
Alexander	0b02040327	little fixes and typos fix	2020-01-10 15:52:02 +03:00
Alexander	cda2c1fc63	fix for subgroup tuple ... added settings for swoosh adapters local	2020-01-10 15:52:01 +03:00
Alexander	f9d01068cf	suggestions fix	2020-01-10 15:52:01 +03:00
Alexander	4306769671	adapter children	2020-01-10 15:52:00 +03:00
Alex S	2753285b77	config editing through database	2020-01-10 15:51:59 +03:00
Ivan Tashkinov	6c94b7498b	[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.	2020-01-10 10:52:21 +03:00
Mark Felder	89243fee8e	Fix captcha time, which was meant to be 5 minutes	2020-01-09 15:45:46 -06:00
sadposter	5f4fc0c373	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-12-23 19:07:20 +00:00
Egor Kislitsyn	b012e66e4e	Increase CAPTCHA expiration time to 5 minutes	2019-12-23 15:14:46 +07:00
Maksim Pechnikov	54c9db38c8	Merge branch 'develop' into issue/1383	2019-12-21 20:38:59 +03:00
Mark Felder	b7811dfb7b	Instead allow a dedicated benchmark config	2019-12-19 12:16:53 -06:00
Mark Felder	50638525db	Merge branch 'develop' into config/benchmark	2019-12-19 12:16:33 -06:00
sadposter	5fb1c96500	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-12-17 17:54:15 +00:00
Egor Kislitsyn	b9a87b1baa	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-16 22:34:21 +07:00
Egor Kislitsyn	a12b6454bb	Add an option to require fetches to be signed	2019-12-16 22:24:03 +07:00
Egor Kislitsyn	fc484e5ce6	Add Kocaptcha endpoint to config.exs	2019-12-16 19:35:10 +07:00
Egor Kislitsyn	8d242f52d4	Revert "Add default endpoint to Pleroma.Captcha.Kocaptcha" ... This reverts commit 82c62c5028.	2019-12-16 19:33:51 +07:00
Egor Kislitsyn	82c62c5028	Add default endpoint to Pleroma.Captcha.Kocaptcha	2019-12-16 15:32:33 +07:00
sadposter	6f5844cf8e	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-12-15 14:11:26 +00:00
Maksim Pechnikov	67cb46e15d	Merge branch 'develop' into issue/1383	2019-12-14 21:44:10 +03:00
Egor Kislitsyn	7528322f83	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-13 01:51:52 +07:00
sadposter	803bce3668	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-12-12 17:48:36 +00:00
Egor Kislitsyn	470a3a678d	Add Kocaptcha endpoint to the test config	2019-12-12 18:04:52 +07:00
Egor Kislitsyn	e536796984	Add native captcha and enable it by default.	2019-12-12 17:39:39 +07:00
stwf	63ffa0e3ed	try local sheduling	2019-12-11 14:57:33 -05:00
Mark Felder	df469b4468	Benchmark env uses test database so we should be able to use test.secret.exs	2019-12-11 12:52:57 -06:00
sadposter	97f67e0786	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-12-11 10:01:04 +00:00
Ivan Tashkinov	835ac2157c	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md	2019-12-10 08:55:14 +03:00
sadposter	d3cee00057	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-12-09 18:17:59 +00:00
Egor Kislitsyn	c098dec473	Merge branch 'develop' into feature/custom-runtime-modules	2019-12-10 00:16:43 +07:00
Egor Kislitsyn	ed92784e7c	Set Logger level to :info in prod	2019-12-09 19:11:54 +07:00
Maksim Pechnikov	5876a9cb79	Merge branch 'develop' into issue/1383	2019-12-08 19:52:46 +03:00
Egor Kislitsyn	a75d4a41e0	Add a test for custom runtime modules	2019-12-06 17:05:09 +07:00
Egor Kislitsyn	157bceeda9	Move runtime configuration from :instance to :modules	2019-12-06 15:04:46 +07:00
Ivan Tashkinov	13926537b6	Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes	2019-12-06 00:26:31 +03:00
Ivan Tashkinov	af42c00cff	[#1427] Reworked admin scopes support. ... Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).	2019-12-06 00:25:44 +03:00
Egor Kislitsyn	48ae3c4347	Add support for custom modules	2019-12-05 20:18:25 +07:00
lain	aa97fe8f17	ChatChannel: Ignore messages that are too long.	2019-12-04 12:48:34 +01:00
Maksim Pechnikov	652cc6ba4b	updated ScheduledActivity	2019-12-04 09:12:17 +03:00
sadposter	a7ec08d853	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-12-01 19:03:08 +00:00
Maksim Pechnikov	b7c449118b	Merge branch 'develop' into issue/1383	2019-11-28 21:27:01 +03:00
Maksim Pechnikov	d55859f5a4	remove quantum package	2019-11-27 16:35:12 +03:00
Maksim Pechnikov	a4f834a687	moved DigestEmail to Oban Periodic jobs	2019-11-27 15:59:13 +03:00
Maksim Pechnikov	c5766a8100	moved ActivityExpiration to Oban Periodic jobs	2019-11-27 13:36:03 +03:00
Maksim Pechnikov	6f202a401b	moved ScheduledActivity to Oban Periodic jobs	2019-11-27 09:26:37 +03:00
Mark Felder	f673e3deef	Default log level for syslog in prod should also be :warn	2019-11-26 05:46:48 -06:00
Maksim Pechnikov	ac3abb5414	moved Pleroma.Stats to Oban Periodic jobs	2019-11-26 10:54:30 +03:00
sadposter	acac6e3540	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-11-25 11:37:49 +00:00
Maksim Pechnikov	0e9be6bafa	moved OAuth.Token.CleanWorker to Oban Periodic jobs	2019-11-25 14:32:20 +03:00
Sadposter	d3656c2725	add ability to set a custom user-agent string	2019-11-25 09:53:11 +00:00
rinpatch	dedb1ad5d6	Merge branch 'revert-5c6c3026' into 'develop' ... Revert "Merge branch 'patch-1' into 'develop'" See merge request pleroma/pleroma!2002	2019-11-21 15:20:05 +00:00
rinpatch	dc9303eac5	Revert "Merge branch 'patch-1' into 'develop'" ... This reverts merge request !1829	2019-11-21 15:03:27 +00:00
Mark Felder	edaae845af	Some tasks try to set log level in test environment, but we were stripping logs belog :warn. ... Ensure console backend logs in test environment are :warn, but mix tasks run in test env do not run with :debug because it's far too verbose.	2019-11-20 11:55:30 -06:00
Mark Felder	c65190c799	Console backend's log format should be prefixed and suffixed with newlines. ... This is how upstream does it by default.	2019-11-20 11:18:42 -06:00
Mark Felder	1c17f18329	Be specific about format for logs in test as we have tests that check it	2019-11-20 09:14:27 -06:00
sadposter	9d29a5063c	fe	2019-11-20 09:48:05 +00:00
Mark Felder	cb513a599c	Allow test builds to have info and debug logs stripped	2019-11-19 16:21:30 -06:00
Mark Felder	ff9133b978	Allow mix tasks to always run with debug logging	2019-11-19 16:01:17 -06:00
Ariadne Conill	1d33eeca72	config: add configuration for MRF ObjectAgePolicy	2019-11-14 18:26:06 -06:00
sadposter	2de30812ea	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-11-13 00:10:01 +00:00
kaniini	2cc043591c	Merge branch 'feature/static-fe' into 'develop' ... Static frontend See merge request pleroma/pleroma!1917	2019-11-11 19:10:44 +00:00
lain	72cc92259e	Default config: Use extended nickname format	2019-11-11 12:49:18 +00:00
rinpatch	4499a7a075	Disable attachment links by default ... Closes #1394	2019-11-10 15:02:47 +03:00
lain	e08bd99bab	Apply suggestion to config/config.exs	2019-11-10 11:02:34 +00:00
lain	4885d403fe	Apply suggestion to config/config.exs	2019-11-10 10:44:23 +00:00
Maksim Pechnikov	9d0b989521	add subject to atom feed	2019-11-10 11:10:20 +03:00
Phil Hagelberg	886a07ba57	Move static_fe config to its own section instead of in :instance.	2019-11-09 18:08:45 -08:00
sadposter	55cc96bcf9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-11-09 19:11:33 +00:00
rinpatch	2f4e9a068f	Bump fast_sanitize to 0.1.1 ... The parser C-Node has been completely rewritten to not use the deprecated `erl_interface` api. Closes #1378 since Nodex was ripped out and the replacement randomizes master node name.	2019-11-08 00:51:04 +03:00
sadposter	9bc70ca0c1	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-11-04 18:20:19 +00:00
rinpatch	9434e151a9	Blacklist myhtmlex nodes from swarm	2019-10-29 01:16:22 +03:00
rinpatch	05d111b622	Use the default scrubber before mediaproxy transformation	2019-10-29 01:15:28 +03:00
sadposter	85b9992f86	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-22 09:12:39 +01:00
KokaKiwi	638457ba94	MastoFE: Add PWA manifest.	2019-10-19 12:15:14 +02:00
rinpatch	5c6c3026ea	Merge branch 'patch-1' into 'develop' ... Fix a typo in default static directory configuration for OTP releases Closes #1289 See merge request pleroma/pleroma!1829	2019-10-18 22:29:04 +00:00
Ariadne Conill	c6de0cbb4a	config: disable Websub and Salmon publisher modules	2019-10-18 14:50:09 +00:00
sadposter	6b9c5e4696	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-18 13:12:58 +01:00
yalh76	fb5dce481c	Fix https://git.pleroma.social/pleroma/pleroma/issues/1289	2019-10-10 20:05:54 +00:00
lain	ecd7ac855b	Benchmark config: Don't use the sql sandbox.	2019-10-10 15:42:54 +02:00
lain	2629493804	Benchmark config: Database adjustments.	2019-10-10 15:01:06 +02:00
lain	c54ae662dc	Merge remote-tracking branch 'origin/develop' into benchmark-finishing	2019-10-10 14:40:59 +02:00
lain	02f8e2a8ab	Gitlab: Run benchmark in CI.	2019-10-10 14:24:54 +02:00
sadposter	58f9ce0deb	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-10 10:28:16 +01:00
Sergey Suprunenko	4b3f77a99f	Extract RSS Feed functionality from OStatus	2019-10-07 12:20:41 +00:00
Ivan Tashkinov	f459aabdfa	Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	2019-10-06 09:30:49 +03:00
sadposter	f1c77f9682	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-05 18:22:05 +01:00
sadposter	59e6b48553	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-10-04 11:48:39 +01:00
Mark Felder	b8b98ac40f	Add missing extended_nickname_format setting to the default config	2019-10-03 10:40:49 -05:00
Ivan Tashkinov	6ffa2b5f66	[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions ... # Conflicts: # CHANGELOG.md	2019-09-30 17:41:20 +03:00
minibikini	f9380289eb	Add remote_ip plug	2019-09-27 21:59:23 +00:00
sadposter	f82d9e1359	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-25 13:33:10 +01:00
kaniini	19263f30c3	Merge branch 'support-rel-ugc' into 'develop' ... Add support for `rel="ugc"` Closes #1255 See merge request pleroma/pleroma!1679	2019-09-23 22:41:31 +00:00
Rachel Fae Fox	63af6951fa	add tunable for stream uploads, as needed for jortage to work.	2019-09-23 20:38:53 +00:00
Egor Kislitsyn	d639cdcecb	Update "config/description.exs"	2019-09-19 14:56:10 +07:00
Egor Kislitsyn	cf3041220a	Add support for rel="ugc"	2019-09-19 14:56:10 +07:00
Ekaterina Vaartis	3e972c0456	Add :shared_pack_cache_seconds_per_file to description.exs	2019-09-19 00:23:18 +03:00
Ekaterina Vaartis	ee620ecbf1	Add caching for emoji pack sharing	2019-09-19 00:16:33 +03:00
Ekaterina Vaartis	7e4c8b56ea	Add tests for emoji pack sharing	2019-09-19 00:16:33 +03:00
Haelwenn (lanodan) Monnier	32d64102cb	description.exs: uncomment type for email logo	2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier	c0c5628200	description.exs: remove empty strings on descriptions	2019-09-17 23:05:26 +02:00
Haelwenn (lanodan) Monnier	50ec445b2c	description.exs: remove empty strings and arrays	2019-09-17 23:05:13 +02:00
Haelwenn (lanodan) Monnier	35dcea3e13	Remove [true,false] for booleans, it is implicit	2019-09-17 21:47:32 +02:00
sadposter	c3de75b2a1	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-17 14:58:02 +01:00
Ivan Tashkinov	e7afb67c5c	[#1260] Rate-limiting for create authentication and related requests.	2019-09-17 16:16:11 +03:00
Egor Kislitsyn	d6ab78e610	Set account_field_value_length limit to 2048 by default	2019-09-16 21:48:01 +07:00
sadposter	4714b739a7	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-16 12:14:48 +01:00
Egor Kislitsyn	96816ceaa2	Revert "Merge branch 'revert-4fabf83a' into 'develop'" ... This reverts commit fe7fd33126, reversing changes made to 4fabf83ad0.	2019-09-16 17:55:04 +07:00
kaniini	c623b4324d	Revert "Merge branch 'streamer-refactoring' into 'develop'" ... This reverts merge request !1653	2019-09-16 09:09:21 +00:00
Steven Fuchs	aab264db82	Streamer refactoring	2019-09-16 07:44:03 +00:00
Ivan Tashkinov	e127b9ab6d	[#1149] Rewritten readme as config/description.exs.	2019-09-14 16:28:59 +03:00
Ivan Tashkinov	6bcedb693c	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md # mix.lock	2019-09-14 16:11:44 +03:00
sadposter	ab55e41626	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-14 00:20:56 +01:00
rinpatch	f884987ace	Merge branch 'admin-config-description' into 'develop' ... Admin config description Closes #1178 and #1209 See merge request pleroma/pleroma!1611	2019-09-13 12:36:24 +00:00
rinpatch	56828abf6d	Use Jason for rendering responses ... Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59))	2019-09-11 23:06:31 +03:00
Alex S	e47089cf55	web_cache_ttl description	2019-09-11 09:32:58 +03:00
Alex S	10827eecad	formatting	2019-09-11 09:25:33 +03:00
Alexander Strizhakov	5db2920644	Apply suggestion to config/description.exs	2019-09-11 09:25:33 +03:00
Alexander Strizhakov	65bc9e66ad	Apply suggestion to config/description.exs	2019-09-11 09:25:33 +03:00
Alex S	6721301086	some changes	2019-09-11 09:25:33 +03:00
Alex S	171cefd889	description.exs	2019-09-11 09:25:33 +03:00
sadposter	94076a23e4	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-10 21:11:03 +01:00
minibikini	11e12b5761	Add Pleroma.Plugs.Cache	2019-09-09 18:53:08 +00:00
Alex S	db690bede9	temp commit	2019-09-05 16:02:20 +03:00
sadposter	c2a1bac5de	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-09-05 12:08:45 +01:00
Ivan Tashkinov	79cf629e1a	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-09-05 11:30:41 +03:00
Ashlynn Anderson	bd8b92ea5e	Remove dynamic config as default, add healthcheck	2019-09-03 09:31:52 -04:00
Ivan Tashkinov	b49085c156	[#1149] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper.	2019-09-02 14:57:40 +03:00
Ivan Tashkinov	a90ea8ba15	[#1149] Addressed code review comments (code style, jobs pruning etc.).	2019-08-31 19:08:56 +03:00
Ivan Tashkinov	e890ea7e82	[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # config/config.exs	2019-08-31 14:25:43 +03:00
sadposter	cc28184854	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-08-27 08:58:51 +01:00
Egor Kislitsyn	66c1966688	Disable rate limiter by default	2019-08-26 20:36:44 +07:00
lain	cc6c0b4ba6	Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration	2019-08-24 15:48:33 +02:00
Ivan Tashkinov	c34126f89c	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-24 09:29:54 +03:00
aries	e5f76a54e6	Fix default config of account fields length	2019-08-23 21:28:52 +00:00
Ivan Tashkinov	581123f8bb	[#1149] Introduced quantum job scheduler. Documentation & config changes.	2019-08-23 18:28:23 +03:00
Ivan Tashkinov	c29686309e	[#1149] Upgraded oban from 0.6.0 to 0.7.1.	2019-08-23 09:23:10 +03:00
Ivan Tashkinov	7101ba1a21	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-22 21:01:28 +03:00
Ivan Tashkinov	256ff09aa8	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs	2019-08-22 20:59:58 +03:00
lain	f740d786a3	Merge branch 'rate-limit-ap-routes' into 'develop' ... [#1174] Rate limit AP routes See merge request pleroma/pleroma!1586	2019-08-21 16:45:20 +00:00
Egor Kislitsyn	8d899d6197	Add :ap_routes rate limit	2019-08-20 22:10:36 +07:00
lain	8340fe8fcc	Merge branch 'digest-template' into 'develop' ... Improve digest email template See merge request pleroma/pleroma!1565	2019-08-20 12:55:51 +00:00
Egor Kislitsyn	158231cd20	Add configurable colors and logo for the digest template	2019-08-16 18:32:25 +07:00
sadposter	3fc4b078f2	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-08-16 10:54:53 +01:00
Ivan Tashkinov	8778c16dac	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-14 21:44:50 +03:00
Egor Kislitsyn	a2e1db5632	Increase max account fields limits	2019-08-14 14:58:38 +07:00
Egor Kislitsyn	e457fcc479	Add :max_remote_account_fields config option	2019-08-14 14:58:06 +07:00
Egor Kislitsyn	2c35d4b0b0	Add configurable account field name length limit	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	db3c05f6b4	Add configurable account field value length limit	2019-08-14 14:52:54 +07:00
Egor Kislitsyn	e0ac5c7a66	Add custom profile fields	2019-08-14 14:52:54 +07:00
rinpatch	9ef31767f2	Merge branch 'feature/mrf-vocabulary' into 'develop' ... MRF Vocabulary See merge request pleroma/pleroma!1559	2019-08-13 22:51:15 +00:00
rinpatch	83a3de8cc4	Merge branch 'length-limit-bio' into 'develop' ... Add configurable length limits for `User.bio` and `User.name` See merge request pleroma/pleroma!1515	2019-08-13 22:40:13 +00:00
Ariadne Conill	3fdbeb7087	MRF: add vocabulary policy module	2019-08-13 20:55:38 +00:00
sadposter	5b385962eb	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-08-13 09:05:44 +01:00
Ariadne Conill	f46cd7e9c7	config: remove legacy activitypub accept_blocks setting ... Anyone who is interested in dropping blocks can write their own MRF policy at this point. This setting predated the MRF framework. Disabling the side effect (unsubscription) is still a config option per policy.	2019-08-13 02:15:21 +00:00
sadposter	59c9b90169	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-08-10 23:43:32 +01:00
Ivan Tashkinov	267262491e	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	2019-08-09 20:09:56 +03:00
Ivan Tashkinov	b7fad8d395	[#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.	2019-08-09 20:08:01 +03:00
lain	29807ef6a5	Merge branch 'feature/digest-email' into 'develop' ... Feature/digest email See merge request pleroma/pleroma!1078	2019-08-08 14:38:33 +00:00
sadposter	325372b1e1	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-08-07 08:59:31 +01:00
Hakaba Hitoyo	39c7bbe18f	Remove longfox emoji set	2019-08-04 04:32:45 +00:00
Ashlynn Anderson	4007717534	Run mix format	2019-08-03 13:42:57 -04:00
Ashlynn Anderson	4a418698db	Create docker.exs and docker-entrypoint + round out Dockerfile ... At this point, the implementation is completely working and has been tested running live and federating with other instances.	2019-08-03 00:21:54 -04:00
Roman Chvanikov	9d4f34fbcb	Merge branch 'develop' into feature/digest-email	2019-08-02 18:16:04 +03:00
Ivan Tashkinov	23d279e03e	[#1149] Replaced RetryQueue with oban-based retries.	2019-08-01 17:28:00 +03:00
Egor Kislitsyn	9ca4506355	Add configurable length limits for User.bio and User.name	2019-08-01 15:53:37 +07:00
sadposter	3cc6cb266b	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-07-31 14:23:03 +01:00
rinpatch	c88a5d3251	Merge branch 'develop' into feature/hide-follows-remote	2019-07-31 14:12:29 +03:00
Sachin Joshi	242f5c585e	add account confirmation email resend in mastodon api	2019-07-28 20:30:10 +00:00
Mike Verdone	378f5f0fbe	Add activity expiration worker ... This is a worker that runs every minute and deletes expired activities. It's based heavily on the scheduled activities worker.	2019-07-24 13:14:52 +02:00
Mike Verdone	b729402774	Make test.exs read config in the same way as dev.exs ... This way, if your test.secret.exs has an error, you'll actually see it.	2019-07-24 13:14:52 +02:00
rinpatch	196cad46f3	Resolve merge conflicts	2019-07-20 22:04:47 +03:00
sadposter	c2737d13df	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-07-20 14:28:30 +01:00
Roman Chvanikov	36049f08ef	Merge develop	2019-07-20 01:03:25 +03:00
kaniini	33729bbb28	Merge branch 'feature/richmedia-ttl' into 'develop' ... add the rich media ttl based on image exp time See merge request pleroma/pleroma!1438	2019-07-19 21:36:36 +00:00
Ariadne Conill	1345e0c2bf	tests: add tests for signed object fetches	2019-07-17 23:06:16 +00:00
Ariadne Conill	b2a8ccf37f	config: add sign_object_fetches option	2019-07-17 21:38:06 +00:00
Alexander Strizhakov	10f82c88b8	mastoapi password reset ... added rate limit to password reset configure rate limit in runtime	2019-07-16 21:44:50 +00:00
Sachin Joshi	18234cc44e	add the rich media ttl based on image exp time	2019-07-17 00:20:34 +05:45
Ivan Tashkinov	889dc17abd	[#1094] Rate-limited follow & unfollow actions.	2019-07-16 19:18:30 +03:00
sadposter	d4348eeb62	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-07-14 22:03:20 +01:00
Roman Chvanikov	c729883936	Merge branch 'develop' into feature/digest-email	2019-07-14 21:43:30 +03:00
Alex S	f4447d82b8	parsers configurable	2019-07-14 09:21:56 +03:00
Ariadne Conill	80c46d6d8b	nodeinfo: implement MRF transparency exclusions	2019-07-13 18:53:14 +00:00
rinpatch	e8fa477793	Refactor Follows/Followers counter syncronization ... - Actually sync counters in the database instead of info cache (which got overriden after user update was finished anyway) - Add following count field to user info - Set hide_followers/hide_follows for remote users based on http status codes for the first collection page	2019-07-13 19:27:49 +03:00
kaniini	f4c001062e	Merge branch '1041-status-actions-rate-limit' into 'develop' ... Rate-limited status actions (per user and per user+status). Closes #1041 See merge request pleroma/pleroma!1410	2019-07-13 14:17:17 +00:00
Ivan Tashkinov	369e9bb42f	[#1041] Rate-limited status actions (per user and per user+status).	2019-07-13 14:49:39 +03:00
rinpatch	fa7e0c4262	Workaround for remote server certificate chain issues	2019-07-12 23:53:21 +03:00
Roman Chvanikov	eae991b06a	merge develop	2019-07-12 18:08:27 +03:00
Eugenij	4198c3ac39	Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel	2019-07-11 13:55:31 +00:00
Alex S	59e16fc45a	enable synchronization by default	2019-07-10 18:55:11 +03:00
Alex S	beba7bbc85	removing synchronization worker	2019-07-10 17:42:18 +03:00
Maksim	12b1454245	[#1062] added option to disable send email	2019-07-10 05:34:21 +00:00
sadposter	dbeb8f43fe	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-07-09 21:08:12 +01:00
Roman Chvanikov	371d39e160	Merge develop	2019-07-09 21:21:09 +03:00
Alexander Strizhakov	d6b0fce6e9	Fix/1019 correct count remote users	2019-07-09 17:36:35 +00:00
Alexander Strizhakov	4e6e5d8042	reverse proxy tests	2019-07-09 16:54:13 +00:00
Haelwenn	1ab4e35f27	Merge branch 'enable-ogp-by-default' into 'develop' ... Do not crash if metadata fails to render and enable OGP and TwitterCard by default Closes #1034 See merge request pleroma/pleroma!1388	2019-07-09 16:07:20 +00:00
Haelwenn	95c085174d	Merge branch 'test-speedup' into 'develop' ... Testing: Don't federate in testing. See merge request pleroma/pleroma!1391	2019-07-09 15:35:28 +00:00
lain	abe2e8881f	Testing: Don't federate in testing.	2019-07-09 15:30:51 +09:00
rinpatch	682f1897b7	Enable OpenGraph and TwitterCard by default ... Closes #1034	2019-07-08 13:00:45 +03:00
Ivan Tashkinov	2b9d914089	[#161] Refactoring, documentation.	2019-06-30 15:58:50 +03:00
Roman Chvanikov	657277ffc0	Resolve conflicts	2019-06-29 00:52:50 +03:00
sadposter	87ba9d1bab	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-06-28 18:55:01 +01:00
Mark Felder	f8ec3e129f	In my experience syslog tags are usually lowercase	2019-06-27 13:00:22 -05:00
sadposter	0843f3e0b6	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-06-27 02:17:32 +01:00
kaniini	9f8e645dce	Merge branch 'feature/configurable-pack-extensions' into 'develop' ... Make default pack extensions configurable and default to png and gif See merge request pleroma/pleroma!1338	2019-06-26 05:34:02 +00:00
rinpatch	41e4752950	Make default pack extensions configurable and default to png and gif	2019-06-26 06:48:59 +03:00
Maksim Pechnikov	4ad15ad2a9	add ignore hosts and TLDs for rich_media	2019-06-25 22:25:37 +03:00
sadposter	3a71016699	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-06-25 12:40:02 +01:00
rinpatch	875100de01	Bind to 127.0.0.1 instead of 0.0.0.0 by default	2019-06-23 09:31:39 +03:00
Alexander Strizhakov	32320c1ee9	Fixes for dynamic configuration	2019-06-20 17:43:57 +00:00
sadposter	6f380ee337	merge	2019-06-19 14:20:26 +01:00
rinpatch	f30a3241d2	Deps: Update auto_linker	2019-06-18 16:08:18 +03:00
sadposter	f0fc2da964	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-06-16 17:43:10 +01:00
Alexander Strizhakov	c2ca1f22a2	it is changed in compile time ... we can't change module attributes and endpoint settings in runtime	2019-06-14 15:45:05 +00:00
Egor Kislitsyn	ce823fa88e	Fix rate limit test	2019-06-14 19:24:31 +07:00
rinpatch	ac3d43e620	Set instance static/uploads to be outside of application directory in release config ... In case of releases the application directory changes with each version so the contents will not be accessible	2019-06-14 01:42:56 +03:00
sadposter	922c25d9c7	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-06-12 13:19:24 +01:00
lain	822a9f28d0	Merge branch 'release-config-import' into 'develop' ... Import release config from env variable or /etc/pleroma/config.exs and warn if the file is missing See merge request pleroma/pleroma!1269	2019-06-12 09:58:16 +00:00
rinpatch	f0d96534a4	Import release config from env variable or /etc/pleroma/config.exs and ... warn if the file is missing	2019-06-11 18:55:55 +03:00
Egor Kislitsyn	6f29865d43	Add option to restrict all users to local content	2019-06-11 21:25:53 +07:00
Hakaba Hitoyo	5d5a9a3a35	Better default parameters for suggestion	2019-06-11 11:34:22 +00:00
lain	63ab3c30eb	Merge branch 'feature/rate-limiter' into 'develop' ... Feature/Rate Limiter Closes #943 See merge request pleroma/pleroma!1266	2019-06-11 11:32:01 +00:00
Egor Kislitsyn	ad04d12de6	Replace MastodonAPIController.account_register/2 rate limiter	2019-06-11 16:06:03 +07:00
Egor Kislitsyn	bc8f059367	Add rate limiting for search endpoints	2019-06-11 14:28:39 +07:00
kaniini	e343e4ff91	Merge branch 'change-containment-default' into 'develop' ... Configuration: Skip thread containment by default See merge request pleroma/pleroma!1256	2019-06-11 02:38:13 +00:00
rinpatch	3ecfe2a6d4	Merge branch 'develop' into feature/releases	2019-06-09 13:55:32 +03:00
rinpatch	b6d2db42a7	Fix wrong placement of serve_endpoints	2019-06-08 21:27:39 +03:00
rinpatch	4f5149c93b	Set default loglevel to warn in prod ... It's rare that info logs are needed to debug the issue, so I would suggest setting them to warn in prod by default to make finding the relevant parts easier and potentially even decrease cpu usage on bigger instances Closes #962	2019-06-08 18:02:57 +03:00
rinpatch	4b98a7ce4e	Set serve_endpoints to true in prod config as setting it in runtime ... config would cause issues with mix tasks	2019-06-08 17:17:28 +03:00
rinpatch	3d374bf7df	Basic release skeleton	2019-06-08 17:16:15 +03:00
lain	76fc4c92bb	Fix tests.	2019-06-07 17:16:56 +02:00
lain	593b8b1e6a	Configuration: Skip thread containment by default ... In my tests the interaction between thread containment and other restrictions makes postgresql create some very bad query plans. This caused direct messages to time out on soykaf, for example.	2019-06-07 14:28:14 +02:00
Roman Chvanikov	c0fa000147	Set default config for digest to false	2019-06-07 01:22:35 +03:00
Roman Chvanikov	01fe5abad1	Resolve conflicts	2019-06-07 01:20:50 +03:00
rinpatch	92213fb87c	Replace Mix.env with Pleroma.Config.get(:env) ... Mix.env/0 is not availible in release environments such as distillery or elixir's built-in releases.	2019-06-06 23:59:51 +03:00
sadposter	ee7459ec8c	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-06-06 15:54:38 +01:00
sadposter	febd2fdfd3	add emojo	2019-06-06 15:54:32 +01:00
Egor	f82382de22	[#943] Make the unauthenticated users limitation optional	2019-06-06 12:17:49 +00:00
Ivan Tashkinov	3eefb274f4	OAuth consumer: tests fix, comments, Keycloak config notes.	2019-06-05 13:02:13 +03:00
sadposter	9bc0f51e51	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-06-05 01:25:52 +01:00
Roman Chvanikov	b1b1a270e8	Fix conflict	2019-06-05 02:45:21 +03:00
Maksim Pechnikov	4f2e359687	Merge branch 'develop' into issue/941	2019-06-04 09:49:08 +03:00
kaniini	9f0d0d0805	Merge branch 'feature/mrf-subchain' into 'develop' ... MRF: subchain policy See merge request pleroma/pleroma!1233	2019-06-04 05:49:54 +00:00
kaniini	a536f515dd	Merge branch 'ueberauth_config_extension' into 'develop' ... Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification See merge request pleroma/pleroma!1234	2019-06-04 05:42:49 +00:00
Roman Chvanikov	bd325132ca	Fix tests	2019-06-04 03:07:49 +03:00
Mark Felder	6ef145b4fc	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
Maksim Pechnikov	080e1aa70e	add option skip_thread_containment	2019-06-03 16:13:37 +03:00
sadposter	c4151feb48	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-06-03 13:29:35 +01:00
rinpatch	026b245dbc	Merge branch 'develop' into feature/polls-2-electric-boogalo	2019-06-03 11:14:52 +03:00
Ivan Tashkinov	83663caa81	Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.	2019-06-02 17:45:32 +03:00
William Pitcock	561a21986d	formatting	2019-06-02 10:29:15 +00:00
William Pitcock	4087ccdab8	mrf: add subchain policy	2019-06-02 10:07:42 +00:00
rinpatch	65db5e9f52	Resolve merge conflicts	2019-06-01 16:29:58 +03:00
Haelwenn	f1890d2cac	Merge branch 'dokku' into 'develop' ... Dokku CI support - On-Demand review instances See merge request pleroma/pleroma!1216	2019-05-31 23:09:06 +00:00
lain	4e45f7bc87	CI: Add auto-deployment via dokku.	2019-05-31 10:55:35 +02:00
sadposter	df500529e2	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-05-30 12:12:08 +01:00
sadposter	d19b99009b	add instance resources	2019-05-30 12:11:56 +01:00
Roman Chvanikov	ce47017c89	Merge develop	2019-05-29 18:18:22 +03:00
William Pitcock	56fd7dbdd7	remove @websub and @ostatus module-level constants	2019-05-25 04:43:11 +00:00
William Pitcock	80d55d428f	tests: websub: check only that signature validation succeeds or fails	2019-05-25 04:34:16 +00:00
William Pitcock	9bec891eb4	kill @httpoison	2019-05-25 04:24:21 +00:00
William Pitcock	baf72d6c58	mrf: simple policy: add the ability to strip avatars and banners from user profiles	2019-05-22 18:53:12 +00:00
Maksim	620908a2db	[#699] add worker to clean expired oauth tokens	2019-05-22 15:44:50 +00:00
lambda	714d8d4ef9	Merge branch 'feature/object-pruning' into 'develop' ... Object pruning See merge request pleroma/pleroma!1181	2019-05-22 11:04:30 +00:00
kaniini	79c2cef2fb	Merge branch 'mongooseim-support' into 'develop' ... MongooseIM: Add basic integration endpoints. See merge request pleroma/pleroma!1172	2019-05-22 04:06:54 +00:00
William Pitcock	16b260fb19	add mix task to prune the object database using a configured retention period	2019-05-21 21:38:56 +00:00
rinpatch	76a7429bef	Add poll limits to /api/v1/instance and initial state	2019-05-21 09:13:10 +03:00
Mark Felder	75c7bb9289	Additional reserved usernames	2019-05-20 17:18:59 -05:00
sadposter	3357780ea8	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-05-20 19:36:57 +01:00
Sadposter	daeae8e2e7	Move default mascot configuration to config/	2019-05-20 16:12:55 +01:00
Aaron Tinio	2375e9a95b	Add report filtering to MRF.SimplePolicy	2019-05-20 06:02:50 +08:00
William Pitcock	290f5b2cfe	config: make sending the user agent configurable, disable sending the user agent in tests	2019-05-17 20:28:58 +00:00
lain	8784a7d1b4	RUM: Set rum status by the environment.	2019-05-17 15:21:24 +02:00
lain	412a3d8a0f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index	2019-05-17 12:26:59 +02:00
lain	67af50ec71	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update	2019-05-17 11:33:04 +02:00
lain	e39c190f04	Configuration: disable migration lock.	2019-05-17 11:30:35 +02:00
sadposter	c0b7bc2927	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-05-16 20:24:43 +01:00
sadposter	7f40b66d51	add emojo	2019-05-16 20:24:29 +01:00
Alex S	aa11fa4864	add report uri and report to	2019-05-16 12:49:40 +07:00
lambda	4440e23547	Merge branch 'chore/extricate-http-signatures' into 'develop' ... switch to pleroma/http_signatures library See merge request pleroma/pleroma!1155	2019-05-15 15:37:31 +00:00
lambda	0992094bd6	Merge branch 'cleanup' into 'develop' ... Remove unused queue from the config See merge request pleroma/pleroma!1158	2019-05-15 15:23:13 +00:00
lain	f1e67bdc31	Search: Add optional rum indexing / searching.	2019-05-15 15:28:01 +02:00
rinpatch	153c15cdb2	Merge branch 'legacy-fe-config' into 'develop' ... remove deprecated PleromaFE configuration See merge request pleroma/pleroma!1152	2019-05-15 10:56:19 +00:00
Sachin Joshi	ee22fff5ac	remove deprecated PleromaFE configuration	2019-05-15 15:29:59 +05:45
Egor Kislitsyn	6c9f45f4dd	Remove unused queue from the config	2019-05-15 14:40:20 +07:00
rinpatch	2ca8d20053	Fix rate-limiting tests	2019-05-14 23:16:34 +03:00
William Pitcock	071f78733a	switch to pleroma/http_signatures library	2019-05-14 20:03:13 +00:00
rinpatch	38f3393e93	Make rate limiting for Mastodon Registration API less agressive and enable it by default. ... As discussed on irc. Unlike Mastodon our web interface for registrations is using the same APIs regular apps would be using, so 5 requests per 30 minutes per IP could hurt valid use-cases when Pleroma-FE switches to it. Also enable the endpoint by default, it makes no sense to have it disabled when 1. TwitterAPI endpoint is there and always enabled 2. Unlike Mastodon, there is no way to get an account without using the APIs (makes me wonder why the setting is even there) Also in this commit: minor changelog improvements.	2019-05-14 22:48:16 +03:00
Egor Kislitsyn	5e2b491276	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-05-14 18:15:56 +07:00
lambda	b14a314ce7	Merge branch 'feature/federator-behaviours' into 'develop' ... federator modularization (outgoing) See merge request pleroma/pleroma!1140	2019-05-13 18:58:04 +00:00
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	2019-05-13 18:35:45 +00:00
sadposter	cf2741e067	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-05-13 12:09:35 +01:00
William Pitcock	fedaca15a3	websub: adapt to work as a federator publishing module	2019-05-12 05:04:24 +00:00
William Pitcock	179293e51c	salmon: refactor to work as a federator publishing module	2019-05-12 05:04:21 +00:00
William Pitcock	10695a28d2	federator: publisher: add publish() wrapper	2019-05-12 05:04:16 +00:00
sadposter	4c11429520	Add mayushii	2019-05-12 00:51:01 +01:00
Roman Chvanikov	b6b5b16ba4	Merge develop	2019-05-08 17:08:06 +07:00
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-05-07 16:51:11 +07:00
Alex S	f46295faa7	unused config paramater	2019-05-07 09:07:06 +07:00
sadposter	db0fefc167	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-05-06 20:40:42 +01:00
Maksim	1040caf096	fix format ... Modified-by: Maksim Pechnikov <parallel588@gmail.com>	2019-05-06 17:51:03 +00:00
lambda	aacac9da0b	Merge branch 'feature/bbs' into 'develop' ... BBS / SSH See merge request pleroma/pleroma!997	2019-05-06 17:17:03 +00:00
Alexander Strizhakov	ce6ca0fefe	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion	2019-05-06 16:45:22 +00:00
lain	6ad8ddfd29	Merge remote-tracking branch 'origin/develop' into feature/bbs	2019-05-04 15:00:45 +02:00
Roman Chvanikov	0f0cc2703b	Merge develop	2019-04-30 20:17:52 +07:00
Sadposter	fa632f9c37	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-04-29 12:56:53 +01:00
William Pitcock	501af917b5	add support for bbcode	2019-04-26 22:35:02 +00:00
Mark Felder	24c3e2db2c	Add mediaproxy whitelist capability	2019-04-25 18:11:47 -05:00
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	2019-04-25 13:41:10 +07:00
Alex S	d35246c449	added healthcheck setting to instance config	2019-04-22 17:00:06 +07:00
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-22 13:08:30 +07:00
Ekaterina Vaartis	0d6265cfe2	Change the default manifest to pleroma's namespace	2019-04-21 22:32:34 +03:00
Roman Chvanikov	b87ad13803	Move comments for email_notifications config to docs	2019-04-21 19:36:31 +07:00
Roman Chvanikov	64a2c6a041	Digest emails	2019-04-20 19:42:19 +07:00
Ekaterina Vaartis	8f93d4c423	Remove most finmoji mentions where appropriate	2019-04-20 15:42:14 +03:00
Ekaterina Vaartis	9bd5e2dec9	Make emoji default_manifest a config option	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	a141f0807b	Assume packs without emoji.txt only have emoji pictures, unhardcode ... unhardcode: remove hardcoded /instance/static and actually use the config option as it is used in other places. packs without emoji.txt: these are now assumed to have .png files that are all emojis, their names are used as shortcodes	2019-04-20 11:17:17 +03:00
Ekaterina Vaartis	c26724cc55	Remove finmoji and add a way to download emojis in packs ... These packs are stored in a git repo on pleroma gitlab	2019-04-20 11:17:17 +03:00
Roman Chvanikov	73407f4eea	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email	2019-04-19 23:27:13 +07:00
Roman Chvanikov	aeafa0b2ef	Add Notification.for_user_since/2	2019-04-19 22:16:17 +07:00
Alexander Strizhakov	ada384207b	typo fix ... docs for RelMe provider	2019-04-19 07:50:21 +00:00
Roman Chvanikov	2f0203a4a1	Resolve conflicts	2019-04-17 16:59:05 +07:00
kaniini	73df3046e0	Merge branch 'feature/788-separate-email-addresses' into 'develop' ... Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040	2019-04-16 18:44:07 +00:00
Hakurei Reimu	10096bbf2b	add extra_cookie_attrs option to config ... Allow instance admins to set their own SameSite cookie policy from the config. Default value in the config is `Lax`.	2019-04-16 22:20:56 +08:00
lain	4fecd6f9a7	Config.exs: Add big warning so that nobody ever edits it.	2019-04-15 15:45:15 +02:00
Sadposter	b134bd83ca	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	2019-04-14 19:00:50 +01:00
Alex S	c349573791	Merge develop to 788-separate-email-addresses ... Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs	2019-04-13 12:24:38 +07:00
Sadposter	d5e5e87d01	Update emojo	2019-04-11 10:52:44 +01:00
Egor Kislitsyn	0f2f7d2cec	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-11 15:51:52 +07:00
Alex S	fe13a1d78c	adding notify_email setting for trigger emails	2019-04-10 17:57:41 +07:00
Haelwenn (lanodan) Monnier	1791ee8ec4	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	2019-04-10 06:33:19 +02:00
Egor Kislitsyn	9abf832b03	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 18:48:10 +07:00
lambda	e19590c93f	Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' ... Improve Transmogrifier.upgrade_user_from_ap_id/2 See merge request pleroma/pleroma!1019	2019-04-08 11:42:20 +00:00
lambda	fd45cab9ec	Merge branch 'twitter_oauth' into 'develop' ... OAuth consumer (sign in / sign up with external provider) See merge request pleroma/pleroma!923	2019-04-08 11:41:50 +00:00
lambda	23067908de	Merge branch 'feature/770-add-emoji-tags' into 'develop' ... Feature/770 add emoji tags See merge request pleroma/pleroma!998	2019-04-08 09:50:00 +00:00
Egor Kislitsyn	c3d5c3513a	Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush	2019-04-08 16:46:59 +07:00
Egor Kislitsyn	a1a854646e	Merge branch 'develop' into use-jobs-in-webpush	2019-04-08 16:29:20 +07:00
Ivan Tashkinov	bffddf5e31	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # docs/config.md # test/support/factory.ex	2019-04-08 12:20:26 +03:00
lambda	b4da2bc1d0	Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' ... # Conflicts: # config/config.exs # docs/config.md	2019-04-08 09:18:01 +00:00
eugenijm	2056efa714	Add scheduler for sending scheduled activities to the queue	2019-04-06 23:56:29 +03:00
eugenijm	fc92a0fd8d	Added limits and media attachments for scheduled activities.	2019-04-06 23:55:58 +03:00
Alex S	7410aee886	Merge develop to 770-add-emoji-tags ... Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs	2019-04-06 20:34:00 +07:00
Egor Kislitsyn	f1712cd2f1	Use PleromaJobQueue in Pleroma.Web.Push	2019-04-05 19:38:44 +07:00
Ivan Tashkinov	47a236f753	[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.	2019-04-05 15:12:02 +03:00
Ivan Tashkinov	45765918c3	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-04 23:43:08 +03:00
Mark Felder	66e7b03372	Merge branch 'develop' into feature/prometheus	2019-04-04 15:39:42 -05:00
feld	3b12eeda19	Add ability to ship logs to a Slack channel	2019-04-04 19:52:22 +00:00
Mark Felder	7222afe01b	Clean merge crumbs	2019-04-04 12:29:10 -05:00
href	7e930559fe	Serve metrics at /api/pleroma/app_metrics	2019-04-04 12:27:44 -05:00
Egor Kislitsyn	0b5c818cb7	[#1] fix telemetry	2019-04-04 11:35:09 -05:00
href	bc3618a38d	Set up telemetry and prometheus	2019-04-04 11:30:43 -05:00
Egor Kislitsyn	cfa6e7289f	Improve Transmogrifier.upgrade_user_from_ap_id/2	2019-04-04 16:10:43 +07:00
Alex S	9e0567ec52	Merge develop into feature/770-add-emoji-tags	2019-04-02 19:16:29 +07:00
Ivan Tashkinov	590c935d95	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-02 13:50:12 +03:00
Alex S	08d64b977f	little changes and typos	2019-04-02 16:13:34 +07:00
Alex S	9b2188da7c	refactoring of emoji tags config to use groups	2019-04-02 15:44:56 +07:00
Alex S	3601f03147	Adding tag to emoji ets table ... changes in apis	2019-04-01 17:17:57 +07:00
Ivan Tashkinov	baffdcc480	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # mix.exs	2019-04-01 08:49:32 +03:00
Mark Felder	d5a1e08bf1	Add default mail adapter settings to config	2019-03-31 17:46:17 -05:00
lain	10fdc080a0	BBS: Tests and formatting.	2019-03-31 20:35:10 +02:00
Egor	9a39d1d846	Replace Pleroma.Jobs with pleroma_job_queue	2019-03-29 12:46:05 +00:00
Ivan Tashkinov	20e0f36605	Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth	2019-03-27 15:41:40 +03:00
Ivan Tashkinov	2a95014b9d	[#923] OAuth consumer improvements, fixes, refactoring.	2019-03-27 15:39:35 +03:00
kaniini	1c3d3d0c2b	Merge branch 'safe-mentions' into 'develop' ... Add safe dm mode option. See merge request pleroma/pleroma!958	2019-03-22 00:50:24 +00:00
lain	8468f3f6d4	Add safe dm mode option.	2019-03-20 21:09:36 +01:00
Ivan Tashkinov	81bf6d9e6a	[#923] Typo fix.	2019-03-20 20:29:08 +03:00
Ivan Tashkinov	af68a42ef7	[#923] Support for multiple OAuth consumer strategies.	2019-03-20 20:25:48 +03:00
rinpatch	9a7b817c9a	Ecto 3.0.5 migration ... kms	2019-03-20 15:59:54 +03:00
Ivan Tashkinov	26b6354095	[#923] Support for multiple (external) registrations per user via Registration.	2019-03-18 17:23:38 +03:00
Ivan Tashkinov	2a96283efb	[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth ... # Conflicts: # config/config.exs # lib/pleroma/web/auth/pleroma_authenticator.ex	2019-03-18 10:26:41 +03:00
kaniini	8b352af4dd	Merge branch 'feature/openldap-support' into 'develop' ... OpenLDAP support Closes #203 See merge request pleroma/pleroma!859	2019-03-15 19:57:09 +00:00
Ivan Tashkinov	2739057442	Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth	2019-03-15 17:11:00 +03:00
Ivan Tashkinov	aacbf0f570	[#923] OAuth: prototype of sign in / sign up with Twitter.	2019-03-15 17:08:03 +03:00
rinpatch	28cfb2c37a	Enable dedupe by default	2019-03-15 12:11:13 +03:00
rinpatch	e2fe796c63	Add some tests	2019-03-14 22:02:48 +03:00
link0ff	54e7087ab4	Merge remote-tracking branch 'upstream/develop' into feature/openldap-support	2019-03-14 17:43:30 +02:00
link0ff	9338f061a3	Support LDAP method start_tls	2019-03-12 18:20:02 +02:00
Ivan Tashkinov	63ab61ed3f	Sign in via Twitter (WIP).	2019-03-11 20:37:26 +03:00
kaniini	46200d8fac	Merge branch 'fix-tlsv1.3' into 'develop' ... Fix supported TLS versions as TLS 1.3 support seems buggy. Closes #708 See merge request pleroma/pleroma!892	2019-03-08 22:53:12 +00:00
Ekaterina Vaartis	5021b7836f	Fetch user's outbox posts on first federation with that user	2019-03-08 16:27:56 +03:00
Maksim	bc7570c282	[#647] tests for web push	2019-03-06 13:20:12 +00:00
Haelwenn (lanodan) Monnier	a283a1fcd0	Add default config for masto_fe ... Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22	2019-03-06 02:26:14 +01:00
Egor Kislitsyn	eb84de0143	allow users to disable their own account	2019-03-04 19:55:11 +07:00
KokaKiwi	b57913b13a	Fix supported TLS versions as TLS 1.3 support seems buggy.	2019-03-04 11:30:26 +01:00
link0ff	19e2b85247	Merge remote-tracking branch 'upstream/develop' into feature/openldap-support	2019-03-03 18:29:37 +02:00
William Pitcock	6b2a1ad1c8	config: fix chat endpoint path	2019-02-28 17:00:54 +00:00
William Pitcock	9aec00d711	config: update config for cowboy 2 endpoints	2019-02-28 15:44:12 +00:00
Egor	c3ac9424d2	AutoLinker	2019-02-26 23:32:26 +00:00
link0ff	e278d47023	OpenLDAP support	2019-02-22 15:03:43 +02:00
Egor	bff9eb5ef7	Reports	2019-02-20 16:51:25 +00:00
kaniini	833161b5d2	Merge branch 'feature/jobs' into 'develop' ... Job Queue See merge request pleroma/pleroma!732	2019-02-18 19:43:06 +00:00
lain	d812a347ca	Add optional welcome message.	2019-02-16 16:42:34 +01:00
Karen Konou	d943c90249	Add tests, change default config values, fix a bug	2019-02-15 12:47:50 +01:00
Haelwenn (lanodan) Monnier	71ce564ecc	config/dev.exs: Don’t put secure cookies on dev	2019-02-12 21:50:47 +01:00
Egor Kislitsyn	305d219413	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ... # Conflicts: # lib/pleroma/web/federator/federator.ex # lib/pleroma/web/websub/websub.ex	2019-02-11 13:54:21 +07:00
rinpatch	6c21f5aa16	Merge branch 'develop' into feature/keyword-policy	2019-02-08 13:12:33 +03:00
rinpatch	8a0b755c19	rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy	2019-02-08 13:12:09 +03:00
rinpatch	2174f6eb4f	Add default config for keyword policy	2019-02-08 12:48:39 +03:00
Michael Loftis	43b3f9e96e	rids the duplicate timestamp from default ExSyslogger config	2019-02-06 17:34:09 +00:00
Egor Kislitsyn	3a3a3996b7	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/federator/federator.ex	2019-02-04 20:50:28 +07:00
rinpatch	89762ad230	Merge branch 'feature/hellthread-filter-improvements' into 'develop' ... Improve hellthread filter Closes #584 See merge request pleroma/pleroma!766	2019-02-04 12:36:50 +00:00
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