6215 commits

Author	SHA1	Message	Date
lain	14c6672193	AP C2S: Use common pipelin for deletes.	2020-04-30 16:49:41 +02:00
lain	fdd8e7f276	CommonAPI: Use common pipeline for deletions.	2020-04-30 16:15:38 +02:00
lain	417eed4a2b	SideEffects: Handle deletions.	2020-04-30 15:57:27 +02:00
lain	1fb383f368	DeleteValidator: Deleting a user is valid.	2020-04-30 15:42:30 +02:00
lain	4dc5302f45	Transmogrifier: Handle incoming deletes for non-user objects.	2020-04-30 15:26:23 +02:00
Alexander Strizhakov	36abeedf9f	error rename	2020-04-30 16:09:22 +03:00
Alexander Strizhakov	ddb757f743	emoji api packs changes in routes with docs update	2020-04-30 16:09:18 +03:00
Alexander Strizhakov	342f55fb92	refactor emoji api with fixes	2020-04-30 15:45:52 +03:00
lain	db184a8eb4	DeleteValidator: Mastodon sends unaddressed deletes.	2020-04-30 14:37:14 +02:00
Alexander Strizhakov	5839e67eb8	return data only for updated emoji	2020-04-30 15:24:02 +03:00
lain	42ce7c5164	ObjectValidator: Add actor fetcher.	2020-04-30 14:13:08 +02:00
lain	64bb72f98a	Typo fix.	2020-04-30 13:57:47 +02:00
lain	ad2182bbd2	Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_create_request.ex	2020-04-30 11:38:26 +00:00
lain	4c4344b7b1	Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop' ... [#1364] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed) See merge request pleroma/pleroma!2367	2020-04-30 10:29:46 +00:00
Egor Kislitsyn	9c1adb35de	Merge branch 'develop' into openapi/notifications	2020-04-30 13:52:07 +04:00
Egor Kislitsyn	1898054da4	Merge branch 'develop' into openapi/reports	2020-04-30 13:51:27 +04:00
rinpatch	8cf3a32463	Add exlude_replies to OpenAPI spec for account timelines	2020-04-30 00:49:59 +03:00
lain	b68d56c816	Apply suggestion to lib/pleroma/web/api_spec/schemas/chat_message_response.ex	2020-04-29 19:49:13 +00:00
lain	145d35ff70	Apply suggestion to lib/pleroma/web/pleroma_api/controllers/chat_controller.ex	2020-04-29 19:49:03 +00:00
lain	589ce1e96b	Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex	2020-04-29 19:47:16 +00:00
lain	89a6c34081	Apply suggestion to lib/pleroma/chat.ex	2020-04-29 18:14:34 +00:00
Egor Kislitsyn	39a78998d0	Change Pleroma.CaptchaTest to be a regular module instead of GenServer	2020-04-29 21:26:07 +04:00
Egor Kislitsyn	7b0c8f0fde	Add tests for account registration with captcha enabled and improve errors	2020-04-29 21:26:07 +04:00
Egor Kislitsyn	2f77842bd3	Fix account registration when captcha is enabled but not provided	2020-04-29 21:26:07 +04:00
lain	503de4b8df	ObjectValidator: Add validation for Deletes.	2020-04-29 19:09:51 +02:00
lain	78c864cbee	LikeValidator: Use Recipients Type.	2020-04-29 19:08:36 +02:00
lain	b8056e69e0	Object Validator Types: Add Recipients.	2020-04-29 19:08:08 +02:00
lain	20587aa931	Chat message creation: Check actor.	2020-04-29 14:53:53 +02:00
lain	a88734a0a2	Transmogrifier: Fetch missing actors for chatmessages.	2020-04-29 14:25:33 +02:00
lain	53e3063bd0	Transmogrifier: Remove ChatMessageHandling module.	2020-04-29 13:52:23 +02:00
lain	e055b8d203	Pipeline: Always run common_pipeline in a transaction for now.	2020-04-29 13:45:50 +02:00
lain	67659afe48	ChatOperation: Refactor.	2020-04-29 13:34:43 +02:00
lain	0c491b904d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-29 13:19:04 +02:00
Egor Kislitsyn	5238ae3dd3	Add OpenAPI spec for NotificationController	2020-04-28 21:27:54 +04:00
Ivan Tashkinov	4c0e53367a	[#2349] Post-merge fix.	2020-04-28 20:04:25 +03:00
Ivan Tashkinov	908cf22a6c	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex	2020-04-28 19:56:20 +03:00
lain	dedffd100c	Pipeline: Unify, refactor, DRY.	2020-04-28 17:29:54 +02:00
lain	abd0928229	CreateChatMessageValidator: Validate object existence	2020-04-28 16:45:28 +02:00
lain	6aa116eca7	Create activity handling: Flip it and reverse it ... Both objects and create activities will now go through the common pipeline and will be validated. Objects are now created as a side effect of the Create activity, rolling back a transaction if it's not possible to insert the object.	2020-04-28 16:26:19 +02:00
Egor Kislitsyn	560f2c1979	Add OpenAPI spec for ReportController	2020-04-28 16:50:37 +04:00
lain	b5dc59c8fa	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-28 14:16:21 +02:00
rinpatch	12bb7fc0dc	Merge branch 'openapi/account' into 'develop' ... Add OpenAPI specs for AccountController See merge request pleroma/pleroma!2374	2020-04-28 11:57:16 +00:00
lain	f8e56d4271	SideEffects: Use Object.normalize to get the object.	2020-04-28 13:43:58 +02:00
lain	906cf53ab9	Recipient Type: Cast all elements as ObjectIDs.	2020-04-28 13:38:02 +02:00
Egor Kislitsyn	764b4f95a8	Merge branch 'develop' into global-status-expiration	2020-04-28 14:13:53 +04:00
lain	9994768312	Merge branch 'mongoose-secure' into 'develop' ... mongoose auth endpoint worked for deactivated accounts See merge request pleroma/pleroma!2432	2020-04-28 09:18:59 +00:00
Maksim Pechnikov	ea5142b94b	convert markdown content to html	2020-04-28 09:32:43 +03:00
fence	5ff20793e7	formating	2020-04-28 01:29:31 +02:00
Egor Kislitsyn	dda65f7799	Move single used schemas to operation schema	2020-04-27 22:55:05 +04:00
fence	cc1e2e8d0f	requested changes to mongoose_im_controller.ex	2020-04-27 19:11:03 +02:00
Egor Kislitsyn	2efc00b3cf	Use json_response_and_validate_schema/2 in tests to validate OpenAPI schema	2020-04-27 20:46:52 +04:00
fence	5c7cc10917	add tests for deactivated users for mongoose auth	2020-04-27 18:31:00 +02:00
fence	a626cb682c	secure mongoose auth endpoint	2020-04-27 17:55:33 +02:00
lain	3d040b1a87	Credo fixes.	2020-04-27 17:55:29 +02:00
lain	ad82a216ff	Chat API: Align more to Pleroma/Mastodon API.	2020-04-27 17:48:34 +02:00
lain	49e673dfea	ChatView: Add actor_account_id	2020-04-27 16:08:03 +02:00
lain	3635a9c9c2	InstanceController: Add extensions to /api/v1/instance	2020-04-27 14:28:08 +02:00
lain	00e956528b	Credo fixes.	2020-04-27 14:02:11 +02:00
lain	15ba3700af	Chat Schemas: Inline unimportant Schemas.	2020-04-27 12:45:59 +02:00
Egor Kislitsyn	f1ca917bb0	Merge branch 'develop' into openapi/account	2020-04-27 14:33:00 +04:00
lain	c86143ed73	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-27 12:07:08 +02:00
Alex Gleason	1bd9749a8f	Let blob: pass CSP	2020-04-26 00:29:42 -05:00
Ivan Tashkinov	e16437ff19	[#1706] Formatting fix.	2020-04-25 18:42:08 +03:00
Ivan Tashkinov	0d05e1fe39	[#1706] Prevented error on unresolved activity actors for timeline actions.	2020-04-25 18:24:10 +03:00
Ivan Tashkinov	b4139cc547	[#2409] Made GET /api/v1/accounts/:id/favourites auth-optional, adjusted tests.	2020-04-24 22:25:27 +03:00
rinpatch	8addbd948c	Merge branch 'bugfix/announce-race-condition' into 'develop' ... Announcements: Prevent race condition. See merge request pleroma/pleroma!2423	2020-04-24 16:58:24 +00:00
lain	c30b3b2dc5	Merge branch 'reply-filtering-refactor' into 'develop' ... Reply filtering refactor See merge request pleroma/pleroma!2424	2020-04-24 16:32:13 +00:00
lain	d89cd0a197	Reply Filtering: Refactor.	2020-04-24 18:25:26 +02:00
lain	d862c7156a	Merge branch 'openapi-improvements' into 'develop' ... Support validation for inline OpenAPI schema and automatic tests for examples Closes #1696 See merge request pleroma/pleroma!2421	2020-04-24 16:10:43 +00:00
Egor Kislitsyn	c56c0a3d23	Merge branch 'develop' into global-status-expiration	2020-04-24 18:37:58 +04:00
Ivan Tashkinov	00e62161f6	[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.	2020-04-24 16:52:38 +03:00
Alexander	6e625a427c	reply filtering	2020-04-24 15:43:49 +03:00
lain	cb12585098	Announcements: Prevent race condition.	2020-04-24 14:37:53 +02:00
lain	1df6af2a4c	Credo fixes.	2020-04-24 13:59:48 +02:00
lain	bbf8554c97	ActivitPub: Remove like function. ... We don't need another way to build likes.	2020-04-24 13:48:13 +02:00
Egor Kislitsyn	f362836742	Support validation for inline OpenAPI schema and automatic tests for examples	2020-04-24 15:16:15 +04:00
Ivan Tashkinov	89f38d94c7	[#2409] Fixed before-action callback results persistence.	2020-04-23 21:47:33 +03:00
lain	1e28d34592	ChatMessage: Correctly ingest emoji tags.	2020-04-23 16:19:49 +02:00
lain	ec7335535d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-23 15:47:08 +02:00
rinpatch	1b5f8d19ee	Merge branch 'bugfix/repeating-announce' into 'develop' ... CommonAPI: Don't make repeating announces possible See merge request pleroma/pleroma!2418	2020-04-23 12:40:38 +00:00
lain	7d38197894	CommonAPI: Don't make repeating announces possible	2020-04-23 13:33:30 +02:00
rinpatch	25eec6d72d	Merge branch 'bugfix/null-scheduled-at' into 'develop' ... StatusController: Ignore nil scheduled_at parameters. Closes #1699 See merge request pleroma/pleroma!2412	2020-04-23 11:22:30 +00:00
lain	850377a7b8	Merge branch 'bugfix/1629-fav-race-condition' into 'develop' ... SideEffects: Run in transaction. Closes #1629 See merge request pleroma/pleroma!2417	2020-04-22 19:26:32 +00:00
lain	1bcbdc7a9f	SideEffects: Use less cryptic syntax.	2020-04-22 21:21:21 +02:00
Haelwenn	af27e4dffd	Merge branch 'bugfix/1670-user-count' into 'develop' ... Stats: Ignore internal users for user count. Closes #1670 See merge request pleroma/pleroma!2414	2020-04-22 17:37:09 +00:00
lain	f5bda09de6	Stats: Use invisible property for filtering.	2020-04-22 19:02:22 +02:00
Ivan Tashkinov	e7fb593d13	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md	2020-04-22 20:00:51 +03:00
lain	e62173dfc8	SideEffects: Run in transaction. ... This fixes race conditions.	2020-04-22 18:40:53 +02:00
Egor Kislitsyn	1b06a27746	Update Flake ID description	2020-04-22 20:20:19 +04:00
Egor Kislitsyn	6c26feed01	Merge branch 'develop' into openapi/account	2020-04-22 20:18:12 +04:00
Ivan Tashkinov	0062116e07	Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks ... # Conflicts: # lib/pleroma/web/mastodon_api/controllers/account_controller.ex	2020-04-22 18:51:59 +03:00
Ivan Tashkinov	2958a7d246	Fixed OAuth restrictions for :api routes. Made auth info dropped for :api routes if OAuth check was neither performed nor explicitly skipped.	2020-04-22 18:50:25 +03:00
Haelwenn	28f8fcf8b0	Merge branch 'fix/follow-and-blocks-import' into 'develop' ... Fix follower/blocks import when nicknames starts with @ Closes #1698 See merge request pleroma/pleroma!2416	2020-04-22 15:46:04 +00:00
Haelwenn	468cc977be	Merge branch 'bugfix/following-fix-status-code' into 'develop' ... AccountController: Use code 400 for self-follow. Closes #1674 See merge request pleroma/pleroma!2413	2020-04-22 15:33:04 +00:00
Haelwenn	238058ecae	Merge branch 'bugfix/1543-streaming-boosts' into 'develop' ... Streamer: Stream boosts to the boosting user. Closes #1543 See merge request pleroma/pleroma!2415	2020-04-22 15:31:51 +00:00
Ivan Tashkinov	b03aeae8b9	Apply suggestion to lib/pleroma/notification.ex	2020-04-22 15:31:41 +00:00
Egor Kislitsyn	6db52c3b36	Fix Oban warning ... Warning example: [warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received: [error: "not found @user@server.party", error: "not found "] The job will be considered a success.	2020-04-22 19:27:28 +04:00
Egor Kislitsyn	e7771424a8	Fix blocks import	2020-04-22 19:27:28 +04:00
Egor Kislitsyn	88b82e5c3e	Fix follow import	2020-04-22 19:27:28 +04:00
lain	7a3a88a13e	Streamer: Stream boosts to the boosting user.	2020-04-22 17:21:13 +02:00
Haelwenn	1855c597c2	Merge branch 'feature/voters-count' into 'develop' ... Polls: Persist and show voters' count Closes #1702 See merge request pleroma/pleroma!2411	2020-04-22 15:12:19 +00:00
Haelwenn	2e73c19edc	Merge branch 'worker-messages' into 'develop' ... Worker messages Closes #1705 See merge request pleroma/pleroma!2410	2020-04-22 15:09:10 +00:00
Karol Kosek	452072ec95	static_fe: Add microformats2 classes	2020-04-22 16:02:40 +02:00
lain	8b88e2a6e2	Stats: Ignore internal users for user count.	2020-04-22 15:31:37 +02:00
lain	5b39526198	AccountController: Use code 400 for self-follow.	2020-04-22 15:04:26 +02:00
lain	69ecc39038	Merge branch 'fix/1689-fix-migrate-to-db' into 'develop' ... Fix migrate to db config Closes #1689 See merge request pleroma/pleroma!2394	2020-04-22 12:41:31 +00:00
lain	c10485db16	StatusController: Ignore nil scheduled_at parameters.	2020-04-22 14:26:19 +02:00
lain	5102468d0f	Polls: Persist and show voters' count	2020-04-22 14:06:39 +02:00
lain	923513b641	Federator: Return proper values for jobs	2020-04-22 13:28:52 +02:00
lain	f719a5b23a	WebPush: Return proper values for jobs.	2020-04-22 13:28:34 +02:00
lain	2e62a63749	ChatMessageValidator: Validation changes ... Don't validate if the recipient is blocking the actor.	2020-04-22 12:48:52 +02:00
Egor Kislitsyn	11433cd38d	Add OpenAPI schema for FlakeID	2020-04-21 23:54:45 +04:00
Egor Kislitsyn	f0238d010a	Improve OpenAPI schema ... - Removes unneeded wrapping in examples - Adds `:format` attributes	2020-04-21 23:30:24 +04:00
lain	66c2eb670b	ChatController: Validate parameters.	2020-04-21 18:23:00 +02:00
lain	97ad0c4597	Chats: Add API specs.	2020-04-21 17:51:06 +02:00
Ivan Tashkinov	f685cbd309	Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.	2020-04-21 16:29:19 +03:00
lain	a185b5455f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-21 14:24:27 +02:00
lain	3c828016d9	Merge branch 'openapi/custom-emojis' into 'develop' ... Add OpenAPI spec for CustomEmojiController See merge request pleroma/pleroma!2375	2020-04-21 10:13:50 +00:00
lain	5165287ff4	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-21 12:00:33 +02:00
Ivan Tashkinov	bb5d0eafa4	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md	2020-04-21 08:20:50 +03:00
rinpatch	e57c1b60e4	Merge branch 'accept-deletes' into 'develop' ... Always accept deletions through SimplePolicy, add :reject_deletes group See merge request pleroma/pleroma!2371	2020-04-20 18:30:01 +00:00
rinpatch	7e456ac7f6	Merge branch 'router-cleanup' into 'develop' ... Cleanup and DRY the Router See merge request pleroma/pleroma!2406	2020-04-20 18:29:03 +00: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
Egor Kislitsyn	ed3974af24	Add OpenAPI spec for AccountController.identity_proofs operation	2020-04-20 18:40:02 +04:00
Egor Kislitsyn	736fead494	Merge branch 'develop' into openapi/account	2020-04-20 18:40:02 +04:00
lain	28165dad3a	Merge branch 'cleanup-subscription-controller' into 'develop' ... Cleanup SubscriptionController See merge request pleroma/pleroma!2393	2020-04-20 13:01:17 +00:00
Ilja	8b4de61d64	Fix ObjectAgePolicyTest ... The policy didn't block old posts as it should. * I fixed it and tested on a test server * I added the settings to description so that this information is shown in nodeinfo * TODO: I didn't work TTD and still need to fix the tests	2020-04-20 12:59:16 +00:00
Egor Kislitsyn	258d897579	Cleanup and DRY the Router	2020-04-20 16:39:20 +04:00
lain	b5df4a98e4	ChatMessageView: Support emoji.	2020-04-20 14:38:53 +02:00
lain	7e53da250e	ChatMessage: Support emoji.	2020-04-20 14:08:54 +02:00
lain	b836d3d104	ChatMessageValidator: Require published field	2020-04-20 13:14:59 +02:00
lain	139b9d1338	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-20 12:37:17 +02:00
lain	970b74383b	Credo fixes.	2020-04-20 12:29:19 +02:00
lain	5b6818b3e5	CommonAPI: Obey local limit for chat messages.	2020-04-20 12:08:47 +02:00
lain	ce23673ca1	ChatMessageValidator: Don't validate messages that are too long.	2020-04-20 11:45:11 +02:00
rinpatch	918a8094fc	Merge branch '1559-follow-request-notifications' into 'develop' ... [#1559] Support for "follow_request" notifications Closes #1559 See merge request pleroma/pleroma!2354	2020-04-19 21:45:20 +00:00
Haelwenn	79445ae5d2	Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo Closes #1697 See merge request pleroma/pleroma!2403	2020-04-18 06:59:23 +00:00
Haelwenn	24f760c2f7	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex	2020-04-17 22:48:37 +00:00
Haelwenn (lanodan) Monnier	eb61564005	migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo	2020-04-17 23:57:22 +02:00
Ivan Tashkinov	66f55106bd	[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.	2020-04-17 21:21:10 +03:00
Egor Kislitsyn	163341857a	Improve OpenAPI errors	2020-04-17 19:27:22 +04:00
lain	c845820911	Notifications: Create a chat notification.	2020-04-17 16:55:01 +02:00
rinpatch	e0d7847bc5	Merge branch 'sideeffects-test' into 'develop' ... SideEffects: Test for notification creation. See merge request pleroma/pleroma!2399	2020-04-17 14:03:04 +00:00
lain	8c2c325598	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-17 15:51:24 +02:00
lain	26d9c83316	SideEffects: Test for notification creation.	2020-04-17 15:50:15 +02:00
rinpatch	6936854878	Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering Closes #1695 See merge request pleroma/pleroma!2398	2020-04-17 13:40:25 +00:00
lain	372614cfd3	ChatView: Add a mastodon api representation of the recipient.	2020-04-17 15:37:54 +02: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
Haelwenn (lanodan) Monnier	46f051048f	migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering	2020-04-17 14:32:15 +02:00
lain	d45ae64858	ChatController: Use OAuth scopes.	2020-04-17 13:04:46 +02:00
Alexander Strizhakov	6cda360fea	don't restart postgrex	2020-04-17 12:45:13 +03:00
Haelwenn	a17bfb5fab	Merge branch 'feature/1584-client-captcha-options' into 'develop' ... Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252	2020-04-17 09:19:35 +00:00
Haelwenn	d8142ee6fe	Merge branch 'fix/1694-transfer-task-fix' into 'develop' ... Fix for logger configuration Closes #1694 See merge request pleroma/pleroma!2396	2020-04-17 09:02:10 +00:00
Haelwenn	9c76d70a47	Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop' ... Added need_reboot endpoint to admin api Closes #1677 See merge request pleroma/pleroma!2373	2020-04-17 08:55:46 +00:00
Alexander Strizhakov	304ea09f4c	fix for logger configuration	2020-04-17 08:42:48 +03:00
rinpatch	badd888ccb	Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop' ... Enforcement of OAuth scopes check for authenticated API endpoints See merge request pleroma/pleroma!2349	2020-04-16 21:58:57 +00:00
rinpatch	28bcde5d98	Merge branch 'fix/1691-feed-render' into 'develop' ... Fix for use of `published` field from different entities Closes #1691 See merge request pleroma/pleroma!2395	2020-04-16 18:38:58 +00:00
rinpatch	942d7467ca	Merge branch 'develop' into features/remove-user-source_data	2020-04-16 21:28:52 +03:00
lain	f8c3ae7a62	ChatController: Handle pagination.	2020-04-16 18:43:31 +02:00
lain	e983f70884	ChatMessagesHandling: Strip HTML of incoming messages.	2020-04-16 17:50:24 +02:00
Alexander Strizhakov	4d330d9df1	fix for use of published from different entities	2020-04-16 18:05:36 +03:00
rinpatch	252528a4b9	Merge branch 'refactor/remove-upgrade-changeset' into 'develop' ... Remove User.upgrade_changeset in favor of remote_user_creation See merge request pleroma/pleroma!2368	2020-04-16 14:59:11 +00:00
rinpatch	77ee64b993	user: remove blank?	2020-04-16 17:54:57 +03:00
lain	41fdcb7282	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-16 15:28:08 +02:00
lain	ca598e9c27	AccountView: Return user ap_id.	2020-04-16 15:27:35 +02:00
lain	e2ced04917	ChatMessages: Better validation.	2020-04-16 15:21:47 +02:00
Alexander Strizhakov	72ef6cc4f2	added need_reboot endpoint to admin api	2020-04-16 16:03:26 +03:00
lain	3d4eca5dd4	CommonAPI: Escape HTML for chat messages.	2020-04-16 12:56:29 +02:00
Egor Kislitsyn	cf4ebba774	Cleanup SubscriptionController	2020-04-15 23:14:47 +04:00
Maksim Pechnikov	4b3b1fec4e	added an endpoint for getting unread notification count	2020-04-15 21:19:43 +03:00
Ivan Tashkinov	bde1189c34	[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.	2020-04-15 21:19:16 +03:00
lain	6ace22b56a	Chat: Add views, don't return them in timeline queries.	2020-04-15 18:23:16 +02:00
Ivan Tashkinov	bedf92e064	Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement	2020-04-15 19:20:34 +03:00
Haelwenn	b1c1d2e5e1	Merge branch 'fix/1659-rate-limiter' into 'develop' ... remote_ip plug adds remote_ip_found flag Closes #1659 See merge request pleroma/pleroma!2390	2020-04-15 15:26:55 +00:00
Egor Kislitsyn	65f04b7806	Fix credo warning	2020-04-15 17:16:32 +04:00
Egor Kislitsyn	16f4787bf7	Add a TODO note	2020-04-15 16:51:37 +04:00
Egor Kislitsyn	0e647ff55a	Abstract pagination params in OpenAPI spec	2020-04-15 16:45:45 +04:00
lain	44bfb491ea	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-15 14:41:43 +02:00
Alexander Strizhakov	22bde21c4f	remote_ip plug adds remote_ip_found flag	2020-04-15 15:27:34 +03:00
Egor Kislitsyn	8ed162b655	Fix formatting	2020-04-15 15:57:00 +04:00
minibikini	5a2e45a218	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 11:29:10 +00:00
minibikini	81a4c15816	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:48:52 +00:00
minibikini	a45bd91d4e	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:48:32 +00:00
minibikini	bfa26b0937	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:30:19 +00:00
minibikini	a794ba655f	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:27:01 +00:00
minibikini	a7feca1604	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:26:53 +00:00
minibikini	d3e876aeee	Apply suggestion to lib/pleroma/web/api_spec/operations/account_operation.ex	2020-04-15 10:26:44 +00:00
lain	6bc76df287	Uploads: Sandbox them in the CSP.	2020-04-15 12:05:22 +02:00
rinpatch	96eae62995	Merge branch 'fix/openapi-form-mimetype' into 'develop' ... openapi: add application/x-www-form-urlencoded to body types Closes #1683 See merge request pleroma/pleroma!2387	2020-04-14 22:01:24 +00:00
rinpatch	cc4ff19e34	openapi: add application/x-www-form-urlencoded to body types ... Closes #1683	2020-04-15 00:49:21 +03:00
Ivan Tashkinov	f7e623c11c	[#1364] Resolved merge conflicts with develop.	2020-04-14 20:19:08 +03:00
Ivan Tashkinov	0cda80f266	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/notification.ex	2020-04-14 20:10:02 +03:00
Mark Felder	3bf78f2be7	Fix Oban not receiving :ok from RichMediaHelper job	2020-04-14 11:43:53 -05:00
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" ... This reverts merge request !1877	2020-04-14 16:32:22 +00:00
Egor Kislitsyn	247e6fcb90	Merge branch 'develop' into openapi/account	2020-04-14 19:45:22 +04:00
feld	bf3afbc1a1	Merge branch 'logger-configuration' into 'develop' ... Fix for logger configuration through admin-fe See merge request pleroma/pleroma!2365	2020-04-14 15:11:25 +00:00
lain	5fc6ce30ac	Merge branch 'chore/spelling' into 'develop' ... Fix spelling in log message See merge request pleroma/pleroma!2378	2020-04-14 13:07:57 +00:00
lain	2eae5793cd	Merge branch 'fix/issue_1679' into 'develop' ... [#1679] fixed logs See merge request pleroma/pleroma!2379	2020-04-14 11:08:33 +00:00
Ivan Tashkinov	650853fc89	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/notification.ex	2020-04-14 11:58:38 +03:00
Haelwenn	60cc7d6c9a	Merge branch 'issue/1276' into 'develop' ... [#1276] An endpoint for getting unread notification count Closes #1276 See merge request pleroma/pleroma!1877	2020-04-14 06:38:56 +00:00
Maksim Pechnikov	c4e7ed660c	fix logger message	2020-04-14 08:43:47 +03:00
Mark Felder	f3725b8fc4	Fix spelling	2020-04-13 17:04:43 -05:00
Egor Kislitsyn	4dca712e90	Add OpenAPI spec for DomainBlockController	2020-04-13 22:44:52 +04:00
Maksim Pechnikov	a16b3dbcbf	Merge branch 'develop' into issue/1276	2020-04-13 21:19:27 +03:00
Egor Kislitsyn	c28aaf9d82	Add OpenAPI spec for CustomEmojiController	2020-04-13 21:21:04 +04:00
Egor Kislitsyn	7e0b42d99f	Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements	2020-04-13 18:17:09 +04:00
Egor Kislitsyn	ab185d3ea4	Add spec for AccountController.follows	2020-04-13 18:17:09 +04:00
Egor Kislitsyn	68a979b824	Add specs for AccountController.block and AccountController.unblock	2020-04-13 18:17:08 +04:00
Egor Kislitsyn	e4195d4a68	Add specs for AccountController.mute and AccountController.unmute	2020-04-13 18:17:08 +04:00
Egor Kislitsyn	aa958a6dda	Add spec for AccountController.unfollow	2020-04-13 18:17:08 +04:00
Egor Kislitsyn	854780c72b	Add spec for AccountController.follow	2020-04-13 18:17:08 +04:00
Egor Kislitsyn	1b680a98ae	Add spec for AccountController.lists	2020-04-13 18:17:07 +04:00
Egor Kislitsyn	e105cc12b6	Add spec for AccountController.following	2020-04-13 18:17:07 +04:00
Egor Kislitsyn	bd6e2b300f	Add spec for AccountController.followers	2020-04-13 18:17:07 +04:00
Egor Kislitsyn	03124c96cc	Add spec for AccountController.statuses	2020-04-13 18:17:07 +04:00
Egor Kislitsyn	278b3fa0ad	Add spec for AccountController.show	2020-04-13 18:16:07 +04:00
Egor Kislitsyn	d7d6a83233	Add spec for AccountController.relationships	2020-04-13 18:16:07 +04:00
Egor Kislitsyn	ab400b2ddb	Add specs for ActorType and VisibilityScope	2020-04-13 18:16:07 +04:00
Egor Kislitsyn	260cbddc94	Add spec for AccountController.update_credentials	2020-04-13 18:16:07 +04:00
Egor Kislitsyn	f80116125f	Add spec for AccountController.verify_credentials	2020-04-13 17:38:59 +04:00
Egor Kislitsyn	b08ded6c2f	Add spec for AccountController.create	2020-04-13 17:38:59 +04:00
Ivan Tashkinov	99b0bc1989	[#1364] Resolved merge conflicts with develop. Refactoring.	2020-04-13 13:24:31 +03:00
Egor Kislitsyn	dc8fa04192	Merge branch 'develop' into global-status-expiration	2020-04-13 14:12:51 +04:00
Ivan Tashkinov	f00ff20768	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/following_relationship.ex	2020-04-13 09:23:50 +03:00
Ivan Tashkinov	a21baf89d8	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	2020-04-13 09:16:51 +03:00
Alexander Strizhakov	a050f3e015	fix for logger configuration through admin-fe	2020-04-13 08:56:28 +03:00
Maksim Pechnikov	c5c09fc61b	fix mediaType of object	2020-04-13 07:02:57 +03:00
Alex Gleason	9a3c74b244	Always accept deletions through SimplePolicy	2020-04-12 20:26:35 -05:00
Ivan Tashkinov	c556efb761	[#1364] Enabled notifications on followed domain-blocked users' activities.	2020-04-12 21:53:03 +03:00
rinpatch	5e365448f3	Merge branch 'following-relationships-optimizations' into 'develop' ... FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332	2020-04-11 19:46:04 +00:00
rinpatch	c077ad0b33	Remove User.upgrade_changeset in favor of remote_user_creation ... The two changesets had the same purpose, yet some changes were updated in one, but not the other (`uri`, for example). Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from `ActivityPub.make_user_from_ap_id` only when the user is actually not AP enabled yet. I did not bother rewriting tests that used `User.insert_or_update` to use the changeset instead because they seemed to just test the implementation, rather than behavior.	2020-04-11 22:31:46 +03:00
Ivan Tashkinov	88b16fdfb7	[#1364] Disabled notifications on activities from blocked domains.	2020-04-11 16:01:09 +03:00
Egor Kislitsyn	dd612f86ae	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-04-10 20:00:05 +04:00
lain	64c78581fe	Chat: Only create them for valid users for now.	2020-04-10 14:47:56 +02:00
Egor Kislitsyn	7f692343c8	Merge branch 'develop' into global-status-expiration	2020-04-10 14:20:48 +04:00
Egor Kislitsyn	cf2a0574e7	Merge branch 'develop' into fix/support-conversations-pagination	2020-04-10 14:18:57 +04:00
Haelwenn	4d33e0bd50	Merge branch 'bugfix/apc2s_upload_activity' into 'develop' ... bugfix: AP C2S activity with attachments See merge request pleroma/pleroma!2316	2020-04-10 04:31:13 +00:00
Haelwenn (lanodan) Monnier	e89078ac2a	User: remove source_data	2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier	3420dec494	Remove User.fields/1	2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier	9172d719cc	profile emojis in User.emoji instead of source_data	2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier	62656ab259	User: Move inbox & shared_inbox to own fields	2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier	369c03834c	formatter: Use user.uri instead of user.source_data.uri	2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier	b6bed1a284	Types.URI: New	2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier	19eedb3d04	User: Move public_key from source_data to own field	2020-04-10 06:16:18 +02:00
Haelwenn (lanodan) Monnier	5628984df4	User: remove source_data use for follower_address and following_address	2020-04-10 06:16:18 +02:00
lain	2cc6841424	ChatController: Basic message posting.	2020-04-09 17:18:31 +02:00
lain	e8fd0dd689	ChatController: Basic support for returning messages.	2020-04-09 16:59:49 +02:00
lain	68abea313d	ChatController: Add creation and return of chats.	2020-04-09 15:13:55 +02:00
Egor Kislitsyn	d545b883eb	Add /api/v1/notifications/:id/dismiss endpoint	2020-04-09 17:08:43 +04:00
Ivan Tashkinov	ac672a9d6b	[#1559] Addressed code review requests.	2020-04-09 15:13:37 +03:00
lain	d35e114acd	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-09 13:25:27 +02:00
lain	8e637ae1a7	CommonAPI: Basic ChatMessage support.	2020-04-09 13:20:16 +02:00
lain	2e78686686	SideEffects: Handle ChatMessage creation.	2020-04-09 12:44:20 +02:00
lain	b87b798ca1	Merge branch 'fix/1658-invite-send' into 'develop' ... Error improvement for email_invite endpoint See merge request pleroma/pleroma!2344	2020-04-09 10:42:43 +00:00
Alexander Strizhakov	f20a19de85	typo fix	2020-04-09 13:28:54 +03:00
Alexander Strizhakov	1cf0d5ab0d	Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex	2020-04-09 10:17:36 +00:00
Alexander Strizhakov	4c60fdcbb1	Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex	2020-04-09 10:17:31 +00:00
lain	d2e21fbc96	Merge branch 'open-api' into 'develop' ... Add OpenAPI Closes pleroma-meta#19 See merge request pleroma/pleroma!2345	2020-04-09 09:48:56 +00:00
lain	564f3f01ca	Merge branch 'formatter-html-safe' into 'develop' ... formatter.ex: Use Phoenix.HTML for mention/hashtag generation See merge request pleroma/pleroma!2357	2020-04-09 09:47:07 +00:00
Haelwenn (lanodan) Monnier	c401b00c78	ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}	2020-04-09 04:36:39 +02:00
rinpatch	d067eaa7b3	formatter.ex: Use Phoenix.HTML for mention/hashtag generation ... Unlike concatenating strings, this makes sure everything is escaped. Tests had to be changed because Phoenix.HTML runs attributes through Enum.sort before generation for whatever reason.	2020-04-08 22:58:31 +03:00
Alexander Strizhakov	5739c498c0	fix for gun connections pool	2020-04-08 18:46:01 +03:00
lain	3775683a04	ChatMessage: Basic incoming handling.	2020-04-08 15:55:43 +02: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
rinpatch	dd4d10b275	Merge branch 'fix-auto-link-for-profile-fields' into 'develop' ... Use Pleroma.Formatter.linkify/2 instead See merge request pleroma/pleroma!2352	2020-04-07 11:41:10 +00:00
Maksim Pechnikov	2b7d7bbd2d	Merge branch 'develop' into issue/1276	2020-04-07 14:09:43 +03:00
lain	19335be24c	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	2020-04-06 17:50:31 +02:00
Egor Kislitsyn	03eebabe8e	Add Pleroma.Web.ApiSpec.Helpers	2020-04-06 17:11:00 +04:00
lain	1d4ab06505	Merge branch 'featureflag/emoji_reactions' into 'develop' ... Add emoji reactions to features in nodeinfo See merge request pleroma/pleroma!2313	2020-04-06 12:51:35 +00:00
lain	349b9d86dc	Merge branch 'remake-remodel-2' into 'develop' ... Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315	2020-04-06 11:59:01 +00:00
lain	772bc258cd	ObjectID Validator: Refactor.	2020-04-06 13:53:24 +02:00
lain	e67cde0ed6	Transmogrifier: Refactoring / Renaming.	2020-04-06 13:46:34 +02:00
Ivan Tashkinov	fc81e5a49c	Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).	2020-04-06 10:20:44 +03:00
Ivan Tashkinov	3fa51f7272	Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses ... # Conflicts: # lib/pleroma/web/mastodon_api/views/account_view.ex # lib/pleroma/web/mastodon_api/views/status_view.ex	2020-04-02 19:38:39 +03:00
Ivan Tashkinov	aa78325117	[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.	2020-04-02 19:23:30 +03:00
Egor Kislitsyn	0aa24a150b	Add oAuth	2020-04-02 17:33:23 +04:00
lain	fd97b0e634	Chats: Basic implementation.	2020-04-02 15:19:09 +02:00
Maksim Pechnikov	dbcfac11b4	Merge branch 'develop' into issue/1276	2020-04-02 14:47:17 +03:00
Egor Kislitsyn	23219e6fb3	Add OpenAPI	2020-04-01 23:13:08 +04:00
Alexander Strizhakov	2d64500a9d	error improvement for email_invite endpoint	2020-04-01 20:26:33 +03: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
lain	037b49c415	Validators: Correct ObjectID filename	2020-04-01 16:10:17 +02:00
rinpatch	bfec45bf74	Merge branch 'fix/1601-add-new-meta-tag' into 'develop' ... Restrict remote users from indexing Closes #1601 See merge request pleroma/pleroma!2341	2020-04-01 12:55:52 +00:00
Alexander Strizhakov	94ddbe4098	restrict remote users from indexing	2020-04-01 09:57:12 +03:00
Haelwenn (lanodan) Monnier	185520d1b4	Provide known-good user.uri, remove User.profile_url/1	2020-03-31 23:55:29 +02:00
Haelwenn (lanodan) Monnier	b30fb1f3bb	User: Fix use of source_data in profile_url/1	2020-03-31 23:54:20 +02:00
kPherox	7408f003a6	Use Pleroma.Formatter.linkify instead of AutoLinker.link	2020-04-01 02:52:30 +09:00
lain	c982093cc2	Transmogrifier: Fix BAD code by RINPATCH	2020-03-31 19:33:41 +02:00
lain	1b323ce1c6	Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex	2020-03-31 17:28:18 +00:00
lain	ecac57732a	Transmogrifier: Only add context if it really is onne.	2020-03-31 19:16:45 +02:00
lain	51fc504705	Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	2020-03-31 19:06:08 +02:00
lain	288f2b5a7c	Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex	2020-03-31 17:00:55 +00:00
lain	0be1fa0a86	Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex	2020-03-31 17:00:48 +00:00
lain	057438a657	CommonAPI: DRY up a bit.	2020-03-31 17:56:05 +02:00
lain	643f15e77b	Validators: ObjectID is an http uri.	2020-03-31 16:11:38 +02:00
kPherox	d191b0942f	Remove no longer used function	2020-03-31 22:50:18 +09:00
lain	f6835333be	Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex	2020-03-31 12:55:25 +00:00
Ivan Tashkinov	ea9c57b26e	[#2332] Misc. improvements per code change requests.	2020-03-31 09:21:42 +03:00
Ivan Tashkinov	9c94b6a327	[#2332] Misc. fixes per code change requests.	2020-03-30 19:08:37 +03:00
lain	8bd5ad8664	Merge branch 'benchmark-improvements' into 'develop' ... Benchmark improvements See merge request pleroma/pleroma!2308	2020-03-30 14:48:00 +00:00
Alexander Strizhakov	b607ae1a1c	removing grouped reports admin api endpoint	2020-03-30 13:51:45 +03:00
Alexander Strizhakov	1fcdcb12a7	updating gun with bug fix ... https://github.com/ninenines/gun/issues/222	2020-03-30 12:47:12 +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
Haelwenn	e999c67cee	Merge branch 'feature/funkwhale-audio' into 'develop' ... Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287	2020-03-29 19:18:22 +00:00
Maksim Pechnikov	dfd2c74184	Merge branch 'develop' into issue/1276	2020-03-29 06:57:34 +03:00
Ivan Tashkinov	be9d18461a	FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).	2020-03-28 18:49:03 +03:00
Ivan Tashkinov	dfbc05d496	Misc refactoring / tweaks (ThreadMute.exists?/2).	2020-03-27 08:01:03 +03:00
Ivan Tashkinov	6b793d3f83	Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).	2020-03-26 21:54:01 +03:00
lain	29ab1d9f8d	Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	2020-03-26 17:24:10 +01:00
lain	69fc1dd69f	Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex	2020-03-26 14:45:28 +00:00
lain	0c60c0a76a	Validators: Use correct type for IDs.	2020-03-26 15:44:14 +01:00
lain	0adaab8e75	Bump copyright dates.	2020-03-26 15:37:42 +01:00
lain	eaacc64839	Refactors.	2020-03-26 15:33:10 +01:00
lain	ee979dd6d7	Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	2020-03-26 15:24:06 +01:00
lain	d7aa0b645b	Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex	2020-03-26 14:23:19 +00:00
lain	4cf1007a7d	ActivityPub: Small refactor.	2020-03-26 15:16:54 +01:00
Ivan Tashkinov	112101ca52	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering ... # Conflicts: # lib/pleroma/thread_mute.ex	2020-03-26 09:43:58 +03:00
rinpatch	af820f8cf1	Merge branch 'benchmark_timeline' into 'develop' ... Benchmarks: Add timeline benchmark See merge request pleroma/pleroma!2325	2020-03-25 18:06:00 +00:00
Ivan Tashkinov	460e41585c	Further preloading (more endpoints), refactoring, tests.	2020-03-25 20:33:34 +03:00
Ivan Tashkinov	be5e2c4dbb	Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).	2020-03-25 17:01:45 +03:00
Ivan Tashkinov	3fa3d45dbe	[#1364] Minor improvements / comments. ... Further fixes of incorrect usage of "relations" as a short form of "relationships".	2020-03-25 13:05:00 +03: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
Haelwenn (lanodan) Monnier	212c31c637	Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions	2020-03-24 20:32:49 +01:00
Ivan Tashkinov	8f1d622b8d	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	2020-03-24 22:15:37 +03:00
Ivan Tashkinov	13cbb9f6ad	Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).	2020-03-24 22:14:26 +03:00
feld	8eebc75c15	Merge branch 'fix/activity-deletion' into 'develop' ... Fix activity deletion Closes #1640 See merge request pleroma/pleroma!2328	2020-03-24 19:10:32 +00:00
rinpatch	f316882464	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex	2020-03-24 18:37:53 +00:00
lain	aaf00f1ff5	Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex	2020-03-24 18:24:09 +00:00
lain	74560e888e	Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex	2020-03-24 18:20:58 +00:00
lain	1d75d0ed7a	Merge branch 'admin-api-change-password' into 'develop' ... Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials` See merge request pleroma/pleroma!2149	2020-03-24 17:34:13 +00:00
Egor Kislitsyn	4a2538967c	Support pagination in conversations	2020-03-24 20:18:27 +04:00
Egor Kislitsyn	d1a9716a98	Fix activity deletion	2020-03-24 17:38:18 +04:00
rinpatch	fbf02a3722	Merge branch 'bugfix/profile-bio-newline' into 'develop' ... AccountView: fix for other forms of <br> in bio Closes #1643 See merge request pleroma/pleroma!2322	2020-03-23 19:32:01 +00:00
lain	3bd2829e5c	Benchmarks: Add timeline benchmark	2020-03-23 18:56:01 +01:00
Ivan Tashkinov	86f2fbc81e	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	2020-03-23 14:34:58 +03:00
Egor Kislitsyn	5a34dca8ed	Add emoji support in statuses in staticfe	2020-03-23 14:03:31 +04:00
Ivan Tashkinov	3c78e5f327	Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.	2020-03-23 12:01:11 +03:00
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	2020-03-23 10:44:47 +03:00
Ivan Tashkinov	c2e415143b	WIP: preloading of user relations for timeline/statuses rendering (performance improvement).	2020-03-22 21:51:44 +03:00
Haelwenn (lanodan) Monnier	15be6ba9c2	AccountView: fix for other forms of <br> in bio ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643	2020-03-22 16:41:01 +01:00
rinpatch	981e015f1b	Mastodon API Account view: Remove an outdated hack ... The hack with caching the follow relationship was introduced when we still were storing it inside the follow activity, resulting in slow queries. Now we store follow state in `FollowRelationship` table, so this is no longer necessary.	2020-03-22 17:10:37 +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
Egor Kislitsyn	cb8236cda6	Add embeddable posts	2020-03-20 21:46:26 +04:00
lain	d74405fc1a	Merge branch 'fix-feed-pagination' into 'develop' ... Fix for feed page pagination Closes #1605 See merge request pleroma/pleroma!2281	2020-03-20 16:57:51 +00:00
lain	1aa8aa7d7f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	2020-03-20 14:52:58 +01:00
Alexander Strizhakov	fe15f0ba15	restrict_unauthenticated setting	2020-03-20 16:36:20 +03:00
Alexander Strizhakov	98a60df41f	include_types parameter in /api/v1/notifications	2020-03-20 13:18:12 +03:00
Haelwenn (lanodan) Monnier	a8aa917530	Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity	2020-03-19 19:25:50 +01:00
Haelwenn (lanodan) Monnier	c1fd4f6653	transmogrifier.ex: rework fix_attachment for better IR	2020-03-19 19:10:03 +01:00
lain	9b9d67bbec	Fix linting.	2020-03-19 18:16:12 +01:00
lain	3c2c32b460	Merge branch 'remake-remodel' into develop	2020-03-19 18:00:55 +01:00
Mark Felder	7d275970ab	Add emoji reactions to features in nodeinfo	2020-03-19 10:08:11 -05:00
Haelwenn (lanodan) Monnier	f9d622d25a	WIP	2020-03-19 15:39:11 +01:00
Alexander Strizhakov	f9ecb513fa	Merge branch 'develop' into gun	2020-03-18 14:08:21 +03:00
Ivan Tashkinov	7438833685	[#1364] Improved notification-related tests.	2020-03-16 21:58:10 +03:00
eugenijm	13cce9c0de	Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.	2020-03-16 20:42:37 +03:00
eugenijm	d198e7fa2a	Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password	2020-03-16 20:32:07 +03:00
Alexander Strizhakov	f3791add99	removing with_move parameter	2020-03-16 20:07:45 +03:00
Ivan Tashkinov	0e07c5ef57	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	2020-03-16 17:58:42 +03:00
Alexander Strizhakov	bf474ca3c1	fix	2020-03-16 16:23:49 +03:00
Alexander Strizhakov	35471205f8	temp fix for :gun.info MatchError	2020-03-16 15:47:25 +03: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	89e4b3ebbd	fix for content-type header for tag feed	2020-03-16 12:59:18 +03:00
Alexander Strizhakov	91870c8995	adding rss for user feed	2020-03-16 12:45:31 +03:00
Alexander Strizhakov	26e2076659	fix for feed page pagination	2020-03-16 12:33:55 +03:00
Haelwenn (lanodan) Monnier	8176ca9e40	static_fe: Sanitize HTML in users	2020-03-15 20:44:04 +01:00
Haelwenn (lanodan) Monnier	0ac6e29654	static_fe: Sanitize HTML in posts ... Note: Seems to have different sanitization with TwitterCard generator giving the following: <meta content=\"“alert(&#39;xss&#39;)”\" property=\"twitter:description\">	2020-03-15 20:44:04 +01:00
lain	fa4ec17c84	Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop' ... [#1560] Restricted AP- & OStatus-related routes for non-federating instances Closes #1560 See merge request pleroma/pleroma!2235	2020-03-15 19:15:20 +00:00
Ivan Tashkinov	7c8003c3fc	[#1364] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.	2020-03-15 21:00:12 +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
Haelwenn	67a27825b1	Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop' ... rate limiter: disable based on if remote ip was found, not on if the plug was enabled Closes #1620 See merge request pleroma/pleroma!2296	2020-03-15 14:22:10 +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
Haelwenn (lanodan) Monnier	8f7bc07ebc	pleroma_api_controller.ex: Improve conversations error reporting ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1594	2020-03-15 12:35:23 +01:00
Ivan Tashkinov	ecb7809e92	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # lib/pleroma/plugs/static_fe_plug.ex	2020-03-14 15:37:02 +03:00
rinpatch	d88c8a9614	Merge branch 'fix/cache-control-headers' into 'develop' ... Fix Cache Control headers on media See merge request pleroma/pleroma!2295	2020-03-14 11:19:42 +00:00
rinpatch	6a28c198af	uploaded media plug: do not inject compile-time params on every request	2020-03-13 22:12:33 +03:00
rinpatch	38f796a5c6	Merge branch 'feature/mastofe-admin-scope' into 'develop' ... auth_controller.ex: Add admin scope to MastoFE See merge request pleroma/pleroma!2256	2020-03-13 18:58:52 +00:00
rinpatch	994ac4357c	Merge branch 'fix/hashtags-streaming' into 'develop' ... Fix hashtags WebSocket streaming Closes #1593 See merge request pleroma/pleroma!2294	2020-03-13 18:50:17 +00:00
rinpatch	658f30c0b3	Merge branch 'static-accept-missing' into 'develop' ... Fix static FE plug to handle missing Accept header. See merge request pleroma/pleroma!2260	2020-03-13 18:46:54 +00: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
rinpatch	3e0f05f08e	Merge branch 'bugfix/br-vs-newline' into 'develop' ... Formatting: Do not use \n and prefer <br> instead Closes #1374 and #1375 See merge request pleroma/pleroma!2204	2020-03-13 18:22:55 +00:00
Mark Felder	c6eb1c1b92	Merge branch 'develop' into fix/cache-control-headers	2020-03-13 12:54:06 -05:00
Mark Felder	7321429a2e	Lint	2020-03-13 12:42:06 -05:00
Mark Felder	3b1b183b42	Synchronize cache-control header for local media with the mediaproxy	2020-03-13 12:27:50 -05:00
Mark Felder	413177c8f0	Set correct Cache-Control header for local media	2020-03-13 12:02:58 -05:00
Mark Felder	c62195127d	Update comment to reflect what the code is actually doing	2020-03-13 11:46:40 -05:00
Mark Felder	ad31d0726a	Do not trust remote Cache-Control headers for mediaproxy	2020-03-13 11:30:27 -05:00
rinpatch	096c5c52e0	Merge branch 'revert/cache-control' into 'develop' ... Revert "Set better Cache-Control header for static content" Closes #1613 See merge request pleroma/pleroma!2290	2020-03-13 16:25:10 +00:00
Egor Kislitsyn	fffc382f13	Fix hashtags WebSocket streaming	2020-03-13 19:30:42 +04:00
Haelwenn (lanodan) Monnier	d1379c4de8	Formatting: Do not use \n and prefer <br> instead ... It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375	2020-03-13 16:07:17 +01:00
Alexander Strizhakov	98ed0d1c4b	more clean up	2020-03-13 09:37:57 +03:00
feld	802b991814	Merge branch 'exclude-posts-visible-to-admin' into 'develop' ... Exclude private and direct statuses visible to the admin when using godmode Closes #1599 See merge request pleroma/pleroma!2272	2020-03-12 20:29:51 +00:00
Alexander Strizhakov	39ed608b13	Merge branch 'develop' into gun	2020-03-12 18:31:10 +03:00
Alexander Strizhakov	1306b92997	clean up	2020-03-12 18:29:07 +03:00
Egor Kislitsyn	d1c7f8e576	Merge remote-tracking branch 'origin/develop' into global-status-expiration	2020-03-12 16:02:24 +04:00
Ivan Tashkinov	bd40880fa0	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # test/web/activity_pub/activity_pub_controller_test.exs	2020-03-12 12:07:07 +03:00
feld	2019f3b3ff	Merge branch 'fix/signup-without-email' into 'develop' ... Allow account registration without an email See merge request pleroma/pleroma!2246	2020-03-11 16:53:05 +00:00
rinpatch	7cdabdc0df	Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' ... Merging default release config on app start Closes #1610 See merge request pleroma/pleroma!2288	2020-03-11 15:16:18 +00:00
feld	f92c447bbc	Merge branch 'relay-list-change' into 'develop' ... Relay list shows hosts without accepted follow See merge request pleroma/pleroma!2240	2020-03-11 15:10:09 +00:00
rinpatch	c3b9fbd3a7	Revert "Set better Cache-Control header for static content" ... On furher investigation it seems like all that did was cause unintuitive behavior. The emoji request flood that was the reason for introducing it isn't really that big of a deal either, since Plug.Static only needs to read file modification time and size to determine the ETag. Closes #1613	2020-03-11 17:58:25 +03:00
Alexander Strizhakov	fce090c1de	using Pleroma.Config instead of ets	2020-03-11 17:22:50 +03:00
Alexander Strizhakov	193d67cde5	compile fix	2020-03-11 16:43:58 +03:00
Alexander Strizhakov	282a93554f	merging release default config on app start	2020-03-11 16:25:53 +03:00
Haelwenn (lanodan) Monnier	863ec33ba2	Add support for funkwhale Audio activity ... reel2bits fixture not included as it lacks the Actor fixture for it. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624 Closes: https://git.pleroma.social/pleroma/pleroma/issues/764	2020-03-11 13:46:42 +01:00
Ivan Tashkinov	5b696a8ac1	[#1560] Enforced authentication for non-federating instances in StaticFEController.	2020-03-11 14:05:56 +03:00
Ivan Tashkinov	972889550d	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-11 09:15:55 +03:00
Mark Felder	5af798f246	Fix enforcement of character limits	2020-03-10 13:08:00 -05:00
Alexander Strizhakov	f39e1b9eff	add verify tls_opts only when we open connection ... for other requests tesla will add tls_opts	2020-03-10 15:54:11 +03:00
Alexander Strizhakov	426f5ee48a	tesla adapter can't be changed in adminFE	2020-03-10 15:31:44 +03:00
Ivan Tashkinov	5fc92deef3	[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.	2020-03-09 20:51:44 +03:00
Alexander Strizhakov	d9f8941dac	Merge branch 'develop' into gun	2020-03-09 10:56:33 +03:00
Maksim Pechnikov	edb659dc57	Merge branch 'develop' into issue/1276	2020-03-08 14:10:59 +03:00
rinpatch	6cf1958b02	moderation log: fix improperly migrated data ... Some of the actions used to have a user map as a subject, which was then changed to an array of user maps. However instead of migrating old data there was just a hack to transform it every time, moreover this hack didn't include all possible actions, which resulted in crashes. This commit fixes the crashes by introducing a proper database migration for old data. Closes #1606	2020-03-07 17:00:58 +03:00
Alexander Strizhakov	474ef512df	wait in mix task while pleroma is rebooted	2020-03-07 16:02:55 +03:00
Alexander Strizhakov	b2eb1124d1	Merge branch 'develop' into gun	2020-03-07 12:41:37 +03:00
rinpatch	6d797b9928	Merge branch 'restart-fix-for-mix-tasks' into 'develop' ... Wait in mix task while pleroma is rebooted See merge request pleroma/pleroma!2225	2020-03-07 09:32:29 +00:00
Alexander Strizhakov	5f42ecc4c7	start gun upload pool, if proxy_remote is enabled	2020-03-07 12:24:39 +03:00
Alexander Strizhakov	78282dc983	little polishing	2020-03-06 21:24:19 +03:00
Alexander Strizhakov	c93c3096d5	little refactor	2020-03-06 21:04:18 +03:00
Ivan Tashkinov	027714b519	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-06 11:48:30 +03:00
Ivan Tashkinov	40765875d4	[#1560] Misc. improvements in ActivityPubController federation state restrictions.	2020-03-05 21:19:21 +03:00
Alexander Strizhakov	058c9b01ac	returning, not needed	2020-03-05 18:28:04 +03:00
Alexander Strizhakov	f0753eed0f	removing try block in tesla request ... added mocks for tests which fail with Tesla.Mock.Error	2020-03-05 17:31:06 +03:00
eugenijm	ad22e94f33	Exclude private and direct statuses visible to the admin when using godmode	2020-03-05 15:15:27 +03:00
lain	47604907c9	Merge branch 'proper_error_messages' into 'develop' ... MastodonController: Return 404 errors correctly. See merge request pleroma/pleroma!2270	2020-03-05 11:49:51 +00:00
Haelwenn	927079e2ff	Merge branch 'fix/stats-on-startup' into 'develop' ... Generate instance stats on startup Closes #1598 See merge request pleroma/pleroma!2271	2020-03-05 07:25:23 +00:00
Alexander Strizhakov	eb324467d9	removing try block in getting gun info	2020-03-05 09:51:52 +03:00
Mark Felder	cdb05633a6	Generate instance stats on startup	2020-03-04 13:33:26 -06:00
feld	9b740cfb23	Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop' ... Exclude reblogs from `GET /api/pleroma/admin/statuses` by default Closes #1596 See merge request pleroma/pleroma!2267	2020-03-04 18:22:37 +00:00
lain	4bce13fa2f	MastodonController: Return 404 errors correctly.	2020-03-04 18:09:06 +01:00
Alexander Strizhakov	d6bebd4f9c	moving some logic to tesla adapter ... - checking original inside gun adapter - flushing streams on max_body error	2020-03-04 18:13:24 +03:00
lain	6f7a8c43a2	Merge branch 'fix/no-email-no-fail' into 'develop' ... Do not fail when user has no email See merge request pleroma/pleroma!2249	2020-03-04 12:43:06 +00:00
Alexander Strizhakov	22d52f5691	same copyright date format	2020-03-04 09:41:23 +03:00
Alexander Strizhakov	6b2fb9160c	otp version	2020-03-04 09:23:42 +03:00
Mark Felder	d9c5ae7c09	Update Copyrights for gun related files	2020-03-03 17:16:24 -06:00
Mark Felder	4427161ca3	Merge branch 'develop' into gun	2020-03-03 17:15:49 -06:00
Mark Felder	05da5f5cca	Update Copyrights	2020-03-03 16:44:49 -06:00
Ivan Tashkinov	b6fc98d9cd	[#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests.	2020-03-03 22:22:02 +03:00
Alexander Strizhakov	884d9710b2	refactoring for gun api modules	2020-03-03 19:24:14 +03:00
Alexander Strizhakov	f98ee730f0	adapter renaming to adapter_helper	2020-03-03 18:53:44 +03:00
Alexander Strizhakov	8854770fc4	retry and retry_timeout settings default change	2020-03-03 18:01:35 +03:00
Alexander Strizhakov	1ad34bfdba	no try block in checkout connection	2020-03-03 17:44:04 +03:00
Alexander Strizhakov	24bf5c4e89	remove try block from pool request	2020-03-03 17:27:56 +03:00
Alexander Strizhakov	aaa879ce75	proxy parsing errors	2020-03-03 17:27:22 +03:00
Alexander Strizhakov	6ebf389d6e	poolboy timeout fix	2020-03-03 16:51:49 +03:00
Alexander Strizhakov	8fc00b7cbf	return error if connection failed to open	2020-03-03 16:42:24 +03:00
Alexander Strizhakov	7d68924e4f	naming	2020-03-03 16:42:24 +03:00
Alexander Strizhakov	e605e79df9	simplification of formatting host method ... case for format_proxy method	2020-03-03 16:42:03 +03:00
Alexander Strizhakov	ee8071f0d5	removing unused method	2020-03-03 15:12:09 +03:00
Alexander Strizhakov	05429730e4	unnecessary with	2020-03-03 15:11:48 +03:00
Alexander Strizhakov	d0e4d3ca3b	removing unnecessary with ... comment in tesla client impovement	2020-03-03 14:56:49 +03:00
Alexander Strizhakov	24d1ac125c	hiding raise error logic to otp_version module	2020-03-03 13:24:19 +03:00
Alexander Strizhakov	28ed4b41d0	naming for checkin from pool timeout	2020-03-03 13:05:28 +03:00
Alexander Strizhakov	151dc4e387	Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex	2020-03-03 09:53:37 +00:00
Alexander Strizhakov	7eb6592992	Apply suggestion to lib/pleroma/pool/connections.ex	2020-03-03 09:53:31 +00:00
Alexander Strizhakov	a21a66972f	Apply suggestion to lib/pleroma/http/http.ex	2020-03-03 09:52:01 +00:00
Alexander Strizhakov	614e3934f9	Apply suggestion to lib/pleroma/http/http.ex	2020-03-03 09:50:42 +00:00
Alexander Strizhakov	d30ff35d94	Apply suggestion to lib/pleroma/http/request_builder.ex	2020-03-03 09:46:53 +00:00
Alexander Strizhakov	a3ad028973	Apply suggestion to lib/pleroma/http/adapter.ex	2020-03-03 09:34:36 +00:00
Alexander Strizhakov	2c8d80dc0a	Apply suggestion to lib/pleroma/pool/connections.ex	2020-03-03 09:29:57 +00:00
Alexander Strizhakov	097ad10d02	Apply suggestion to lib/pleroma/pool/connections.ex	2020-03-03 09:29:51 +00:00
Alexander Strizhakov	4c8569d403	otp_version refactor	2020-03-03 12:21:10 +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
Ivan Tashkinov	99a6c660a9	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-02 18:41:12 +03:00
eugenijm	7af431c150	Exclude reblogs from GET /api/pleroma/admin/statuses by default	2020-03-02 16:47:31 +03:00
Egor Kislitsyn	4a45b96a91	Merge branch 'develop' into fix/signup-without-email	2020-03-02 15:35:49 +04:00
Haelwenn	764a50f8a6	Merge branch 'feature/1482-activity_pub_transactions' into 'develop' ... ActivityPub actions & side-effects in transaction Closes #1482 See merge request pleroma/pleroma!2089	2020-03-02 07:58:01 +00:00
Alexander Strizhakov	cc98d010ed	relay list shows hosts without accepted follow	2020-03-02 09:27:20 +03:00
Haelwenn (lanodan) Monnier	6da6540036	Bump copyright years of files changed after 2020-01-07 ... Done via the following command: git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'	2020-03-02 06:08:45 +01:00
Alexander Strizhakov	d9e4b77f8b	Merge branch 'develop' into gun	2020-03-01 12:48:49 +03:00
Alexander Strizhakov	400fbc7629	wait in mix task while pleroma is rebooted	2020-03-01 12:36:09 +03:00
Alexander Strizhakov	34f1d09f3a	spec fix	2020-03-01 12:01:39 +03:00
Alexander Strizhakov	ba87ed7335	fix for compiling	2020-03-01 12:01:39 +03:00
Alexander Strizhakov	32d1e04817	ActivityPub actions & side-effects in transaction	2020-03-01 12:01:39 +03:00
Phil Hagelberg	523f73dccd	Fix static FE plug to handle missing Accept header.	2020-02-29 18:53:49 -08:00
rinpatch	b5465bf385	timeline controller: add a TODO for replacing copypaste with a macro	2020-03-01 02:03:46 +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	4d416343fa	rate limiter: Fix a race condition ... When multiple requests are processed by rate limiter plug at the same time and the bucket is not yet initialized, both would try to initialize the bucket resulting in an internal server error.	2020-03-01 01:13:07 +03:00
rinpatch	df2173343a	pagination: limit the number of elements returned at one time to 40	2020-03-01 01:11:54 +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
Ivan Tashkinov	c747260989	[#2250] Tiny refactoring per merge request review.	2020-02-29 22:04:09 +03:00
Alexander Strizhakov	814b275af7	Merge branch 'develop' into gun	2020-02-29 11:34:50 +03:00
Haelwenn (lanodan) Monnier	3ef2ff3e47	auth_controller.ex: Add admin scope to MastoFE ... Related: https://git.pleroma.social/pleroma/pleroma/issues/1265	2020-02-29 01:25:14 +01:00
Ivan Tashkinov	3759b146c4	Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex	2020-02-28 13:33:42 +00:00
feld	f2216287a7	Merge branch 'admin-status-list' into 'develop' ... Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`) Closes #1550 See merge request pleroma/pleroma!2192	2020-02-27 18:11:04 +00:00
Ivan Tashkinov	6f2efb1c45	Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.	2020-02-27 18:46:05 +03:00
Egor Kislitsyn	cb60a9c42f	Do not fail when user has no email	2020-02-27 17:27:49 +04:00
eugenijm	4ab07cf0d5	Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses	2020-02-26 22:35:57 +03:00
eugenijm	e2a6a40367	Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only)	2020-02-26 20:21:38 +03:00
Egor Kislitsyn	f446744a6a	Allow account registration without an email	2020-02-26 20:13:53 +04:00
Egor Kislitsyn	22018adae6	Fix Dialyzer warnings	2020-02-25 18:34:56 +04:00
Maksim Pechnikov	10f452ad1f	Merge branch 'develop' into issue/1276	2020-02-25 07:22:56 +03:00
eugenijm	7ad5c51f23	Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope	2020-02-24 21:46:37 +03:00
Alexander Strizhakov	8efae966b1	open conn in separate task	2020-02-24 19:56:27 +03:00
lain	81f29e7c6a	Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' ... Bugfix: return invalid when answer_data is nil Closes #1585 See merge request pleroma/pleroma!2236	2020-02-24 14:54:22 +00:00
Haelwenn (lanodan) Monnier	f9fe6a9e30	Captcha: return invalid when answer_data is nil	2020-02-24 02:49:53 +01:00
Ivan Tashkinov	0cf1d4fcd0	[#1560] Restricted AP- & OStatus-related routes for non-federating instances.	2020-02-22 19:48:41 +03: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
Alexander Strizhakov	d44f9e3b6c	fix for timeout clause	2020-02-21 16:56:55 +03:00
Alexander Strizhakov	f604f9e470	hackney pool timeout	2020-02-21 14:33:55 +03:00
Alexander Strizhakov	6806df80dd	don't log info ssl messages	2020-02-21 14:28:16 +03:00
Egor Kislitsyn	011ede4536	Update documentation	2020-02-21 14:42:43 +04:00
Alexander Strizhakov	ad8f26c0a4	more info in Connections.checkin timout errors	2020-02-21 12:53:40 +03: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
Haelwenn	c5570e0493	Merge branch 'single_emoji_reaction' into 'develop' ... Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226	2020-02-20 23:50:40 +00:00
Egor Kislitsyn	819cd46717	Auto-expire Create activities only	2020-02-20 22:04:02 +04: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
lain	c69b04c490	Merge branch 'features/remote-follow-userpage-redirect' into 'develop' ... remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123	2020-02-20 12:04:29 +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	3432294657	[#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3	2020-02-20 14:48:46 +03:00
lain	314928333a	Pleroma API: Add endpoint to get reaction information on a single emoji	2020-02-19 17:16:45 +01:00
Alexander Strizhakov	c9db0507f8	removing retry option and changing some logger messages levels	2020-02-19 12:26:57 +03:00
Mark Felder	7d73e7a09a	Spelling	2020-02-18 09:18:09 -06:00
Mark Felder	cf94349287	Merge branch 'develop' into gun	2020-02-18 09:06:27 -06:00
lain	cf8307e71c	Merge branch 'fix/status-view/expires_at' into 'develop' ... Fix `status.expires_at` type Closes #1573 See merge request pleroma/pleroma!2222	2020-02-18 14:56:59 +00:00
Ivan Tashkinov	61d9f43e46	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	2020-02-18 17:46:09 +03:00
lain	3fa2ac68df	Merge branch 'chore/standardize-mrf-behavior' into 'develop' ... Standardize @behaviour usage in MRFs See merge request pleroma/pleroma!2212	2020-02-18 14:36:10 +00:00
lain	c07efd5b42	Merge branch 'need-reboot-flag' into 'develop' ... need_reboot flag for adminFE See merge request pleroma/pleroma!2188	2020-02-18 14:32:03 +00:00
Egor Kislitsyn	2ef70b55f5	Fix status.expires_at type	2020-02-18 14:52:11 +04:00
Alexander Strizhakov	514c899275	adding gun adapter	2020-02-18 08:19:01 +03:00
Maksim Pechnikov	28701c08ad	Merge branch 'develop' into issue/1276	2020-02-17 08:56:03 +03:00
rinpatch	472132215e	Use floki's new APIs for parsing fragments	2020-02-16 01:55:26 +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
Haelwenn (lanodan) Monnier	1257331291	MastodonAPI.StatusView: Do not use site_name ... site_name allow to spoof the origin of the domain and so hacks like: <!-- served on https://hacktivis.me/tmp/joinmastodon.org.html --> <meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" /> <meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" /> <meta property="og:site_name" content="joinmastodon.org" /> <meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">	2020-02-15 00:36:09 +01:00
Mark Felder	478619782b	Standardize @behaviour usage in MRFs	2020-02-14 11:02:24 -06:00
Egor Kislitsyn	57878f8708	Improve readability	2020-02-14 15:50:31 +04:00
Egor Kislitsyn	4d459b0e99	Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4	2020-02-13 22:27:10 +04:00
Egor Kislitsyn	241a3d744a	Add ActivityExpirationPolicy	2020-02-13 22:27:10 +04:00
rinpatch	9906c6fb6f	Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop' ... NodeInfo: Fix federating status not being reported when MRF transparency is disabled Closes #1568 See merge request pleroma/pleroma!2206	2020-02-13 18:08:43 +00:00
Maksim Pechnikov	6f9839c73c	Merge branch 'develop' into issue/1276	2020-02-13 20:43:34 +03:00
rinpatch	23049a077e	NodeInfo: Fix federating status not being reported when MRF ... transparency is disabled Closes #1568	2020-02-13 19:53:39 +03: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
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	2020-02-13 09:20:34 +03:00
Egor Kislitsyn	19516af74e	Fix status.expires_in validation	2020-02-12 20:20:44 +04: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
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
lain	24c526a0b1	Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge	2020-02-11 13:58:36 +01:00
Egor Kislitsyn	6875ccb6bf	Merge branch 'develop' into feature/new-registrations-digest	2020-02-11 13:54:55 +04:00
Maksim Pechnikov	58574ef156	Merge branch 'develop' into issue/1276	2020-02-11 08:35:26 +03:00
rinpatch	94e5ca1105	Merge branch 'issue/1383' into 'develop' ... [#1383] Switch periodic jobs from quantum to oban See merge request pleroma/pleroma!2015	2020-02-11 00:04:06 +00:00
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	2020-02-10 20:49:20 +03:00
rinpatch	c55301e760	Fix a compilation error under certain circumstances ... I've noticed that sometimes when switching from develop to stable and back, develop fails to compile and rm -r ing the _build and deps dirs doesn't help at all. This is due to Admin API controller needing to generate JSON description of the config at compile time. Evaluating `config/description.exs` calls `Generator.list_modules_in_dir/2`, which in turn predicts the module names of files in the directory and tries to convert the predicted name to *existing* atoms. Sometimes the compiler will call that function before compiling the modules in the said directory, so the conversion will of course fail. This fixes it by removing the requirement of the atoms being existent. The function is not subjected to any untrusted user input so this should be safe. An ideal fix would be to block the compilation of docs before all modules are compiled and then get a list of compiled elixir modules under the namespace we want instead of directory hacks, but I have not been able to figure out how to do that.	2020-02-10 18:41:02 +03:00
Maksim Pechnikov	3830cb538b	removed a comments	2020-02-10 09:14:15 +03:00
Maksim Pechnikov	cd040691bd	maked unread_count as virtual field	2020-02-10 09:01:45 +03:00
Maksim Pechnikov	b87533760b	Merge branch 'develop' into issue/1276	2020-02-10 07:59:52 +03:00
Ivan Tashkinov	24e49d14f2	[#1505] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests.	2020-02-09 17:34:48 +03:00
Ivan Tashkinov	6ea3c06d8d	[#1505] Minor refactoring.	2020-02-09 14:09:01 +03:00
Ivan Tashkinov	7c3991f59e	[#1505] Fixed replies serialization (included objects' ids instead of activities' ids).	2020-02-09 10:17:21 +03: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
lain	964b4d82a0	Merge branch 'fix/upload-limit-otp' into 'develop' ... Actually fix upload limit on OTP releases Closes #1109 See merge request pleroma/pleroma!2185	2020-02-08 14:02:36 +00:00
Alexander Strizhakov	dad23e3766	need_reboot flag	2020-02-08 13:00:02 +03:00
rinpatch	15ea75cd2a	Actually fix upload limit on OTP releases ... Closes #1109	2020-02-07 20:14:06 +03:00
Haelwenn	1262357ddb	Merge branch 'cancel-follow-request' into 'develop' ... Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175	2020-02-07 16:10:43 +00:00
Lain Soykaf	d85bcc8627	Questions: Add timezone to closed property	2020-02-07 16:57:46 +01:00
Lain Soykaf	4538a1ee01	EmojiReactions: Remove old API endpoints	2020-02-07 15:01:45 +01:00
Lain Soykaf	f875b9650a	EmojiReactions: Add Mastodon-aligned reaction endpoints, change response	2020-02-07 14:52:13 +01:00
Egor Kislitsyn	bc2e98b200	Add User.get_follow_state/2	2020-02-07 16:17:34 +04:00
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	2020-02-06 18:09:57 +01:00
feld	df0b00b32d	Merge branch 'mastoapi-non-html-strings' into 'develop' ... mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167	2020-02-06 16:08:23 +00:00
Egor Kislitsyn	8b9742ecf5	Cancellation of a follow request for a remote user	2020-02-06 18:02:33 +04:00
Alexander Strizhakov	c85aa6e87f	removing confusing error	2020-02-06 12:50:36 +03:00
rinpatch	15cb1f6804	Merge branch 'fix/unpinnable-polls' into 'develop' ... fix not being able to pin polls See merge request pleroma/pleroma!2172	2020-02-05 21:04:16 +00:00
rinpatch	72d767998c	Merge branch 'removing-admin-api-endpoint' into 'develop' ... Removing migrate_from_db endpoint from admin api See merge request pleroma/pleroma!2177	2020-02-05 21:03:56 +00: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
Alexander Strizhakov	5db6ac8ee4	removing migrate_from_db endpoint from admin api	2020-02-05 20:36:21 +03:00
Egor Kislitsyn	3909b5b7b3	Remove AutoLinker scheme option from the config	2020-02-05 21:13:56 +04:00
rinpatch	49e80a1537	Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' ... Restarting pleroma from outside application See merge request pleroma/pleroma!2144	2020-02-05 16:59:21 +00:00
Egor Kislitsyn	8c71f7e11a	Add support for cancellation of a follow request	2020-02-05 20:22:15 +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
rinpatch	50f5a92021	fix not being able to pin polls	2020-02-02 14:55:06 +03:00
rinpatch	983a87175e	mastodon API: do not sanitize html in non-html fields	2020-02-02 14:46:32 +03:00
Roman Chvanikov	8057157ee3	Make attachments cleanup optional	2020-01-31 01:20:37 +03:00
rinpatch	c27d1d65bf	Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop' ... Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064	2020-01-30 19:24:04 +00:00
rinpatch	5b62acf6e9	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	2020-01-30 22:16:55 +03:00
lain	774cba84f5	Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop' ... Re-enable rate limiter and enable remote ip See merge request pleroma/pleroma!2164	2020-01-30 18:47:44 +00:00
lain	a0d9d42eaa	Emoji Reactions: Actually use the validation.	2020-01-30 16:07:37 +01:00
feld	e2f2602fdc	Merge branch 'emoji-api-errors' into 'develop' ... Emoji api error if emoji dir is not writable Closes admin-fe#62 See merge request pleroma/pleroma!2161	2020-01-30 14:13:40 +00:00
feld	df200ea7a4	Merge branch 'http-security-warning' into 'develop' ... Warn if HTTPSecurityPlug is disabled Closes #1528 See merge request pleroma/pleroma!2155	2020-01-30 14:11:29 +00:00
feld	b3e9c87724	Update emoji_api_controller.ex	2020-01-30 14:09:41 +00:00
feld	36becd5573	Update http_security_plug.ex	2020-01-30 14:07:41 +00:00
rinpatch	263abe3ba5	Merge branch 'emoji-reactions-reacted' into 'develop' ... Emoji reactions: Add `reacted` field See merge request pleroma/pleroma!2160	2020-01-30 13:16:04 +00:00
rinpatch	889965141a	RemoteIp: only trust X-Forwarded-For ... Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.	2020-01-30 00:06:58 +03:00
Haelwenn	946de2299c	Merge branch 'fix-streaming-reblog' into 'develop' ... Streamer: Correctly handle reblog mutes Closes #1129 and #1438 See merge request pleroma/pleroma!2156	2020-01-29 20:21:32 +00:00
Egor Kislitsyn	e07e7888d7	Fix credo warning	2020-01-29 18:53:43 +04:00
Egor Kislitsyn	2bd4d6289b	Make the warning more scarier	2020-01-29 18:43:23 +04:00
Alexander Strizhakov	e7fee0d6fa	emoji api error on not writable dir	2020-01-29 15:31:34 +03:00
lain	b3a877d6c9	Emoji Reactions: Correctly handle deleted users	2020-01-29 11:43:36 +01:00
lain	a802e07241	Emoji Reactions: Add reacted field to emoji reactions	2020-01-29 11:39:06 +01:00
Alexander Strizhakov	1f4fbe9d98	title parse improvement	2020-01-29 11:13:34 +03:00
Maksim Pechnikov	ba5e8a6444	Merge branch 'develop' into issue/1276	2020-01-28 21:11:13 +03:00
Maksim Pechnikov	21a2a05407	Merge branch 'develop' into issue/1383	2020-01-28 20:39:20 +03:00
lain	cedee2793d	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect	2020-01-28 17:52:42 +01:00
lain	12b6fcdb8c	Merge branch 'features/task-test-email' into 'develop' ... Create pleroma.email mix task Closes #1061 See merge request pleroma/pleroma!2118	2020-01-28 16:42:57 +00:00
lain	2c121b2623	Merge branch 'fix/1524-link_preview' into 'develop' ... Meta tags parser respects first title tag Closes #1524 See merge request pleroma/pleroma!2157	2020-01-28 16:38:14 +00:00
Alexander Strizhakov	7bd4c14581	meta tag parser respect first title header	2020-01-28 19:29:27 +03:00
lain	d385789a45	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed	2020-01-28 17:06:36 +01:00
Haelwenn	271935953a	Merge branch 'whole-db-removal' into 'develop' ... Remove `whole_db` parameter everywhere, it's not used anymore See merge request pleroma/pleroma!2152	2020-01-28 15:51:45 +00:00
Haelwenn (lanodan) Monnier	4eb935be78	Create pleroma.email mix task ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061	2020-01-28 16:49:38 +01:00
lain	77f24525ca	Streamer: Correctly handle reblog mutes	2020-01-28 16:40:44 +01:00
Egor Kislitsyn	6302b40791	Warn if HTTPSecurityPlug is disabled	2020-01-28 19:14:09 +04:00
feld	d9cb8acd3e	Merge branch 'fix/attachments-cleanup' into 'develop' ... Fix attachments cleanup with custom base_url See merge request pleroma/pleroma!2154	2020-01-28 14:52:57 +00:00
Roman Chvanikov	d18a2e4e36	Add test for custom base_url when deleting an attachment	2020-01-28 17:22:24 +03:00
Roman Chvanikov	804a702f97	Fix base_url string trimming	2020-01-28 17:07:46 +03:00
Roman Chvanikov	dea968463d	Add logging	2020-01-28 16:52:20 +03:00
lain	46915207b6	Remove whole_db parameter everywhere, it's not used anymore	2020-01-28 14:40:40 +01:00
lain	e3fae3380e	Apply suggestion to lib/pleroma/web/feed/tag_controller.ex	2020-01-28 13:38:49 +00:00
Roman Chvanikov	7f78bd7e37	Fix __MODULE__ usage	2020-01-28 16:38:44 +03:00
lain	95afcae194	Merge branch 'support/update_ecto' into 'develop' ... updated ecto and fixed warning See merge request pleroma/pleroma!2150	2020-01-28 12:49:22 +00:00
lain	4f004ab92e	Merge branch 'fix/attachments-cleanup' into 'develop' ... Fix/attachments cleanup See merge request pleroma/pleroma!2148	2020-01-28 12:40:00 +00:00
Maksim Pechnikov	02c3dd2e3d	update ecto	2020-01-28 10:43:47 +03:00
Roman Chvanikov	eb4870e1cd	Remove unused var	2020-01-28 03:54:54 +03:00
Roman Chvanikov	52e08ec9fd	explicitly describe perform op in AttachmentsClenupWorker	2020-01-28 03:52:50 +03:00
Maksim Pechnikov	bcffa662dc	Merge branch 'develop' into feature/tag_feed	2020-01-27 21:13:13 +03:00
Hakaba Hitoyo	dabd535e43	Remove user recommendation by third party engine	2020-01-27 13:21:50 +00:00
Maksim Pechnikov	e442ea5722	Merge branch 'develop' into issue/1276	2020-01-27 15:20:47 +03:00
Maksim Pechnikov	bfc70fdf29	Merge branch 'develop' into issue/1383	2020-01-27 08:48:19 +03:00
Roman Chvanikov	86c4b76bf0	Fix typo	2020-01-27 04:01:50 +03:00
feld	36838b516f	Merge branch 'fix/runtime-config' into 'develop' ... Fixes for runtime config See merge request pleroma/pleroma!2143	2020-01-26 17:35:21 +00:00
Mark Felder	d770cffce0	Merge branch 'develop' into issue/1280	2020-01-26 11:23:05 -06:00
Alexander Strizhakov	e93cc561cd	restarting pleroma from outside application	2020-01-25 18:42:04 +03:00
Ivan Tashkinov	86e4d23acb	[#1505] Background fetching of incoming activities' replies collections.	2020-01-25 10:47:30 +03:00
Alexander Strizhakov	de4102b247	can be changed in runtime	2020-01-25 10:39:10 +03:00
Maksim Pechnikov	99c0a11c58	added atom feed	2020-01-24 22:12:23 +03:00
Maksim Pechnikov	055edd3d72	Merge branch 'develop' into feature/tag_feed	2020-01-24 21:46:57 +03:00
rinpatch	8533b63d1f	Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop' ... Fix for non existing atom Closes #1532 See merge request pleroma/pleroma!2139	2020-01-24 11:33:02 +00:00
rinpatch	0fceeb44b3	Merge branch 'emoji-reaction-sanity-check' into 'develop' ... Emoji reactions: Add sanity checks for the cache See merge request pleroma/pleroma!2132	2020-01-24 11:32:25 +00:00
lain	347f3ed2c6	Emoji reactions: Change api format once more	2020-01-24 10:52:24 +01:00
Alexander Strizhakov	6a0f0ac4a2	fix for non existing atom	2020-01-24 12:22:26 +03:00
Maksim Pechnikov	293281fcbd	Merge branch 'develop' into feature/tag_feed	2020-01-24 08:58:07 +03:00
Alexander Strizhakov	6cd2e851d9	parsing Swoosh modules	2020-01-23 18:21:29 +03:00
Maksim Pechnikov	8589632d09	fixed delete ScheduledActivity	2020-01-23 17:18:23 +03:00
lain	34fc0ca053	Emoji reactions: Add sanity checks for the cache	2020-01-23 12:34:34 +01:00
Maksim Pechnikov	2cfe1b9385	Merge branch 'develop' into feature/tag_feed	2020-01-23 11:42:10 +03:00
Maksim Pechnikov	5fc2fa8908	Merge branch 'develop' into issue/1383	2020-01-23 11:11:18 +03:00
Maksim Pechnikov	ce7c887a27	removed try/rescue	2020-01-23 11:05:08 +03:00