3281 Commits (e7771424a895572626ec36a98bf862952dc6ff07)

Author	SHA1	Message	Date
Egor Kislitsyn	e7771424a8	Fix blocks import	4 years ago
Egor Kislitsyn	88b82e5c3e	Fix follow import	4 years ago
lain	3c828016d9	Merge branch 'openapi/custom-emojis' into 'develop' ... Add OpenAPI spec for CustomEmojiController See merge request pleroma/pleroma!2375	4 years ago
Alex Gleason	bedc558809	Merge remote-tracking branch 'upstream/develop' into accept-deletes	4 years ago
Alex Gleason	b54c8813d6	Add :reject_deletes option to SimplePolicy	4 years ago
lain	28165dad3a	Merge branch 'cleanup-subscription-controller' into 'develop' ... Cleanup SubscriptionController See merge request pleroma/pleroma!2393	4 years ago
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	4 years ago
rinpatch	918a8094fc	Merge branch '1559-follow-request-notifications' into 'develop' ... [#1559] Support for "follow_request" notifications Closes #1559 See merge request pleroma/pleroma!2354	4 years ago
Ivan Tashkinov	66f55106bd	[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.	4 years ago
lain	26d9c83316	SideEffects: Test for notification creation.	4 years ago
Ivan Tashkinov	6e6f95c6ae	Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications ... # Conflicts: # CHANGELOG.md	4 years ago
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	4 years ago
Haelwenn	d8142ee6fe	Merge branch 'fix/1694-transfer-task-fix' into 'develop' ... Fix for logger configuration Closes #1694 See merge request pleroma/pleroma!2396	4 years ago
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	4 years ago
Alexander Strizhakov	304ea09f4c	fix for logger configuration	4 years ago
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	4 years ago
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	4 years ago
rinpatch	942d7467ca	Merge branch 'develop' into features/remove-user-source_data	4 years ago
Alexander Strizhakov	4d330d9df1	fix for use of published from different entities	4 years ago
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	4 years ago
Alexander Strizhakov	72ef6cc4f2	added need_reboot endpoint to admin api	4 years ago
Egor Kislitsyn	cf4ebba774	Cleanup SubscriptionController	4 years ago
Ivan Tashkinov	bde1189c34	[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.	4 years ago
Ivan Tashkinov	bedf92e064	Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement	4 years ago
Alexander Strizhakov	22bde21c4f	remote_ip plug adds remote_ip_found flag	4 years ago
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" ... This reverts merge request !1877	5 years ago
feld	bf3afbc1a1	Merge branch 'logger-configuration' into 'develop' ... Fix for logger configuration through admin-fe See merge request pleroma/pleroma!2365	5 years ago
Haelwenn	60cc7d6c9a	Merge branch 'issue/1276' into 'develop' ... [#1276] An endpoint for getting unread notification count Closes #1276 See merge request pleroma/pleroma!1877	5 years ago
Egor Kislitsyn	4dca712e90	Add OpenAPI spec for DomainBlockController	5 years ago
Maksim Pechnikov	a16b3dbcbf	Merge branch 'develop' into issue/1276	5 years ago
Egor Kislitsyn	c28aaf9d82	Add OpenAPI spec for CustomEmojiController	5 years ago
Ivan Tashkinov	a21baf89d8	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses	5 years ago
Alexander Strizhakov	a050f3e015	fix for logger configuration through admin-fe	5 years ago
Alex Gleason	9a3c74b244	Always accept deletions through SimplePolicy	5 years ago
rinpatch	5e365448f3	Merge branch 'following-relationships-optimizations' into 'develop' ... FollowingRelationship storage & performance optimizations See merge request pleroma/pleroma!2332	5 years ago
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.	5 years ago
Egor Kislitsyn	cf2a0574e7	Merge branch 'develop' into fix/support-conversations-pagination	5 years ago
Haelwenn	4d33e0bd50	Merge branch 'bugfix/apc2s_upload_activity' into 'develop' ... bugfix: AP C2S activity with attachments See merge request pleroma/pleroma!2316	5 years ago
Haelwenn (lanodan) Monnier	e89078ac2a	User: remove source_data	5 years ago
Haelwenn (lanodan) Monnier	3420dec494	Remove User.fields/1	5 years ago
Haelwenn (lanodan) Monnier	9172d719cc	profile emojis in User.emoji instead of source_data	5 years ago
Haelwenn (lanodan) Monnier	62656ab259	User: Move inbox & shared_inbox to own fields	5 years ago
Haelwenn (lanodan) Monnier	369c03834c	formatter: Use user.uri instead of user.source_data.uri	5 years ago
Haelwenn (lanodan) Monnier	19eedb3d04	User: Move public_key from source_data to own field	5 years ago
Egor Kislitsyn	d545b883eb	Add `/api/v1/notifications/:id/dismiss` endpoint	5 years ago
lain	b87b798ca1	Merge branch 'fix/1658-invite-send' into 'develop' ... Error improvement for email_invite endpoint See merge request pleroma/pleroma!2344	5 years ago
Alexander Strizhakov	9795ff5b01	Apply suggestion to test/web/admin_api/admin_api_controller_test.exs	5 years ago
Alexander Strizhakov	365c34a7a9	Apply suggestion to test/web/admin_api/admin_api_controller_test.exs	5 years ago
lain	d2e21fbc96	Merge branch 'open-api' into 'develop' ... Add OpenAPI Closes pleroma-meta#19 See merge request pleroma/pleroma!2345	5 years ago
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.	5 years ago