3500 Commits (156c8a508846bd6d4e55f666c4ecc6f0129ac5fc)

Author	SHA1	Message	Date
fence	d607b4d840	mongooseim test: explicitly set password for the deactivated used	4 years ago
fence	935ca2c132	requested changes to mongoose test	4 years ago
Egor Kislitsyn	2efc00b3cf	Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema	4 years ago
fence	5c7cc10917	add tests for deactivated users for mongoose auth	4 years ago
lain	3635a9c9c2	InstanceController: Add extensions to `/api/v1/instance`	4 years ago
Egor Kislitsyn	f1ca917bb0	Merge branch 'develop' into openapi/account	4 years ago
Ivan Tashkinov	b4139cc547	[#2409] Made `GET /api/v1/accounts/:id/favourites` auth-optional, adjusted tests.	4 years ago
rinpatch	8addbd948c	Merge branch 'bugfix/announce-race-condition' into 'develop' ... Announcements: Prevent race condition. See merge request pleroma/pleroma!2423	4 years ago
lain	c30b3b2dc5	Merge branch 'reply-filtering-refactor' into 'develop' ... Reply filtering refactor See merge request pleroma/pleroma!2424	4 years ago
lain	d89cd0a197	Reply Filtering: Refactor.	4 years ago
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	4 years ago
Ivan Tashkinov	00e62161f6	[#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints.	4 years ago
Alexander	6e625a427c	reply filtering	4 years ago
lain	cb12585098	Announcements: Prevent race condition.	4 years ago
lain	bbf8554c97	ActivitPub: Remove `like` function. ... We don't need another way to build likes.	4 years ago
Egor Kislitsyn	f362836742	Support validation for inline OpenAPI schema and automatic tests for examples	4 years ago
rinpatch	1b5f8d19ee	Merge branch 'bugfix/repeating-announce' into 'develop' ... CommonAPI: Don't make repeating announces possible See merge request pleroma/pleroma!2418	4 years ago
lain	7d38197894	CommonAPI: Don't make repeating announces possible	4 years ago
rinpatch	25eec6d72d	Merge branch 'bugfix/null-scheduled-at' into 'develop' ... StatusController: Ignore nil scheduled_at parameters. Closes #1699 See merge request pleroma/pleroma!2412	4 years ago
lain	850377a7b8	Merge branch 'bugfix/1629-fav-race-condition' into 'develop' ... SideEffects: Run in transaction. Closes #1629 See merge request pleroma/pleroma!2417	4 years ago
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	4 years ago
lain	f5bda09de6	Stats: Use `invisible` property for filtering.	4 years ago
Ivan Tashkinov	e7fb593d13	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md	4 years ago
lain	e62173dfc8	SideEffects: Run in transaction. ... This fixes race conditions.	4 years ago
Egor Kislitsyn	6c26feed01	Merge branch 'develop' into openapi/account	4 years ago
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	4 years ago
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	4 years ago
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	4 years ago
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	4 years ago
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.	4 years ago
Egor Kislitsyn	e7771424a8	Fix blocks import	4 years ago
Egor Kislitsyn	88b82e5c3e	Fix follow import	4 years ago
lain	7a3a88a13e	Streamer: Stream boosts to the boosting user.	4 years ago
Haelwenn	1855c597c2	Merge branch 'feature/voters-count' into 'develop' ... Polls: Persist and show voters' count Closes #1702 See merge request pleroma/pleroma!2411	4 years ago
Haelwenn	2e73c19edc	Merge branch 'worker-messages' into 'develop' ... Worker messages Closes #1705 See merge request pleroma/pleroma!2410	4 years ago
lain	8b88e2a6e2	Stats: Ignore internal users for user count.	4 years ago
lain	5b39526198	AccountController: Use code 400 for self-follow.	4 years ago
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	4 years ago
lain	c10485db16	StatusController: Ignore nil scheduled_at parameters.	4 years ago
lain	5102468d0f	Polls: Persist and show voters' count	4 years ago
lain	923513b641	Federator: Return proper values for jobs	4 years ago
lain	f719a5b23a	WebPush: Return proper values for jobs.	4 years ago
Ivan Tashkinov	f685cbd309	Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.	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
Ivan Tashkinov	bb5d0eafa4	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md	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
Egor Kislitsyn	736fead494	Merge branch 'develop' into openapi/account	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
Egor Kislitsyn	163341857a	Improve OpenAPI errors	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
Alexander Strizhakov	6cda360fea	don't restart postgrex	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
Maksim Pechnikov	4b3b1fec4e	added an endpoint for getting unread notification count	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
Ivan Tashkinov	0cda80f266	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/notification.ex	4 years ago
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" ... This reverts merge request !1877	4 years ago
Egor Kislitsyn	247e6fcb90	Merge branch 'develop' into openapi/account	4 years ago
feld	bf3afbc1a1	Merge branch 'logger-configuration' into 'develop' ... Fix for logger configuration through admin-fe See merge request pleroma/pleroma!2365	4 years ago
Ivan Tashkinov	650853fc89	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/notification.ex	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
Egor Kislitsyn	7e0b42d99f	Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements	5 years ago
Egor Kislitsyn	ab185d3ea4	Add spec for AccountController.follows	5 years ago
Egor Kislitsyn	68a979b824	Add specs for AccountController.block and AccountController.unblock	5 years ago
Egor Kislitsyn	e4195d4a68	Add specs for AccountController.mute and AccountController.unmute	5 years ago
Egor Kislitsyn	aa958a6dda	Add spec for AccountController.unfollow	5 years ago
Egor Kislitsyn	854780c72b	Add spec for AccountController.follow	5 years ago
Egor Kislitsyn	1b680a98ae	Add spec for AccountController.lists	5 years ago
Egor Kislitsyn	e105cc12b6	Add spec for AccountController.following	5 years ago
Egor Kislitsyn	bd6e2b300f	Add spec for AccountController.followers	5 years ago
Egor Kislitsyn	03124c96cc	Add spec for AccountController.statuses	5 years ago
Egor Kislitsyn	278b3fa0ad	Add spec for AccountController.show	5 years ago
Egor Kislitsyn	d7d6a83233	Add spec for AccountController.relationships	5 years ago
Egor Kislitsyn	ab400b2ddb	Add specs for ActorType and VisibilityScope	5 years ago
Egor Kislitsyn	260cbddc94	Add spec for AccountController.update_credentials	5 years ago
Egor Kislitsyn	f80116125f	Add spec for AccountController.verify_credentials	5 years ago
Egor Kislitsyn	b08ded6c2f	Add spec for AccountController.create	5 years ago
Ivan Tashkinov	f00ff20768	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # lib/pleroma/following_relationship.ex	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
Maksim Pechnikov	c5c09fc61b	fix mediaType of object	5 years ago
Alex Gleason	9a3c74b244	Always accept deletions through SimplePolicy	5 years ago
Ivan Tashkinov	c556efb761	[#1364] Enabled notifications on followed domain-blocked users' activities.	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
Ivan Tashkinov	88b16fdfb7	[#1364] Disabled notifications on activities from blocked domains.	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
Ivan Tashkinov	3965772b26	[#1559] Minor change (analysis).	5 years ago
Ivan Tashkinov	f35c28bf07	[#1559] Added / fixed tests for follow / follow_request notifications.	5 years ago
rinpatch	dd4d10b275	Merge branch 'fix-auto-link-for-profile-fields' into 'develop' ... Use Pleroma.Formatter.linkify/2 instead See merge request pleroma/pleroma!2352	5 years ago
Maksim Pechnikov	2b7d7bbd2d	Merge branch 'develop' into issue/1276	5 years ago
kPherox	06471940e0	Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs	5 years ago
lain	1d4ab06505	Merge branch 'featureflag/emoji_reactions' into 'develop' ... Add emoji reactions to features in nodeinfo See merge request pleroma/pleroma!2313	5 years ago
lain	96ee0aadbf	Merge branch 'improving-test-coverage' into 'develop' ... Tests for emoji mix task See merge request pleroma/pleroma!2350	5 years ago
lain	349b9d86dc	Merge branch 'remake-remodel-2' into 'develop' ... Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315	5 years ago
Alexander Strizhakov	a43e055916	using another fn for file deletion	5 years ago
Alexander Strizhakov	b59ac37b2c	tests for emoji mix task	5 years ago
Ivan Tashkinov	fc81e5a49c	Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).	5 years ago
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	5 years ago
Ivan Tashkinov	aa78325117	[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.	5 years ago
Maksim Pechnikov	dbcfac11b4	Merge branch 'develop' into issue/1276	5 years ago
Egor Kislitsyn	23219e6fb3	Add OpenAPI	5 years ago
Alexander Strizhakov	2d64500a9d	error improvement for email_invite endpoint	5 years ago
Ivan Tashkinov	98b96e45ab	Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses ... # Conflicts: # CHANGELOG.md	5 years ago
feld	ef7d2b0f11	Merge branch 'gun' into 'develop' ... Gun adapter Closes #945 See merge request pleroma/pleroma!1861	5 years ago
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.	5 years ago
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	5 years ago
Alexander Strizhakov	94ddbe4098	restrict remote users from indexing	5 years ago
Haelwenn (lanodan) Monnier	185520d1b4	Provide known-good user.uri, remove User.profile_url/1	5 years ago
Haelwenn (lanodan) Monnier	b30fb1f3bb	User: Fix use of source_data in profile_url/1	5 years ago
Haelwenn (lanodan) Monnier	2553400a66	Initial failing test statement against funkwhale channels	5 years ago
kPherox	dbf9d719f9	split test for update profile fields	5 years ago
lain	aebec1bac9	Validator Test: Small refactor.	5 years ago
Alexander Strizhakov	df5f89c0d6	test for default features and changelog entry	5 years ago
lain	643f15e77b	Validators: ObjectID is an http uri.	5 years ago
Alexander Strizhakov	b607ae1a1c	removing grouped reports admin api endpoint	5 years ago
Alexander Strizhakov	f497cf2f7c	Merge branch 'develop' into gun	5 years ago
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	5 years ago
Maksim Pechnikov	dfd2c74184	Merge branch 'develop' into issue/1276	5 years ago
Ivan Tashkinov	be9d18461a	FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).	5 years ago
Ivan Tashkinov	dfbc05d496	Misc refactoring / tweaks (`ThreadMute.exists?/2`).	5 years ago
lain	0adaab8e75	Bump copyright dates.	5 years ago
Ivan Tashkinov	112101ca52	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering ... # Conflicts: # lib/pleroma/thread_mute.ex	5 years ago
rinpatch	de62e633d3	Merge branch '1364-notifications-sending-control' into 'develop' ... [#1364] Ability to opt-out of notifications (in all clients) Closes #1364 See merge request pleroma/pleroma!2301	5 years ago
Ivan Tashkinov	ff1baae7e9	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	5 years ago
Ivan Tashkinov	460e41585c	Further preloading (more endpoints), refactoring, tests.	5 years ago
Egor Kislitsyn	9081a071ee	Add a test for accounts/update_credentials	5 years ago
Ivan Tashkinov	012d428e1f	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	5 years ago
Ivan Tashkinov	e743c22329	Fixed incorrect usage of "relations" as a short form of "relationships".	5 years ago
Haelwenn (lanodan) Monnier	03a18cf037	node_info_test: Bump default features list	5 years ago
Haelwenn (lanodan) Monnier	212c31c637	Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions	5 years ago
Haelwenn (lanodan) Monnier	64165d1df9	node_info_test.exs: Add test on the default feature list	5 years ago
Ivan Tashkinov	8f1d622b8d	Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering	5 years ago
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).	5 years ago
feld	8eebc75c15	Merge branch 'fix/activity-deletion' into 'develop' ... Fix activity deletion Closes #1640 See merge request pleroma/pleroma!2328	5 years ago
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	5 years ago
Egor Kislitsyn	4a2538967c	Support pagination in conversations	5 years ago
Egor Kislitsyn	d1a9716a98	Fix activity deletion	5 years ago
lain	eec1fcaf55	Home timeline tests: Add failing test for relationships	5 years ago
Alexander Strizhakov	a6ee6784bc	creating trusted app from adminFE & mix task	5 years ago
Haelwenn (lanodan) Monnier	15be6ba9c2	AccountView: fix for other forms of <br> in bio ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643	5 years ago
Alexander Strizhakov	7f9b5284fa	updating clear_config	5 years ago
Alexander Strizhakov	9bae9b1b1b	Merge branch 'develop' into gun	5 years ago
lain	d74405fc1a	Merge branch 'fix-feed-pagination' into 'develop' ... Fix for feed page pagination Closes #1605 See merge request pleroma/pleroma!2281	5 years ago
Ivan Tashkinov	1c05f539aa	Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).	5 years ago
Ivan Tashkinov	0e27c274f4	Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements ... # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs	5 years ago
lain	6c1232b486	NotificationController: Fix test.	5 years ago
lain	1aa8aa7d7f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	5 years ago
Alexander Strizhakov	fe15f0ba15	restrict_unauthenticated setting	5 years ago
Alexander Strizhakov	98a60df41f	include_types parameter in /api/v1/notifications	5 years ago
Haelwenn (lanodan) Monnier	a8aa917530	Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity	5 years ago
Haelwenn (lanodan) Monnier	c1fd4f6653	transmogrifier.ex: rework fix_attachment for better IR	5 years ago
lain	3c2c32b460	Merge branch 'remake-remodel' into develop	5 years ago
Haelwenn (lanodan) Monnier	f9d622d25a	WIP	5 years ago
Ivan Tashkinov	ec3719f539	Improved in-test config management functions.	5 years ago
Alexander Strizhakov	f9ecb513fa	Merge branch 'develop' into gun	5 years ago
Haelwenn (lanodan) Monnier	d3cf7e19fb	activity_pub_controller_test.exs: test posting with AP C2S uploaded media	5 years ago
Ivan Tashkinov	7438833685	[#1364] Improved notification-related tests.	5 years ago
eugenijm	13cce9c0de	Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.	5 years ago
eugenijm	d198e7fa2a	Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`	5 years ago
Alexander Strizhakov	f3791add99	removing with_move parameter	5 years ago
Ivan Tashkinov	0e07c5ef57	Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control	5 years ago
Alexander Strizhakov	3805e09b9c	Merge branch 'develop' into gun	5 years ago
Alexander Strizhakov	f0651730bd	Merge branch 'develop' into gun	5 years ago
Alexander Strizhakov	dc2ec84c0f	warnings fix	5 years ago
Alexander Strizhakov	89e4b3ebbd	fix for content-type header for tag feed	5 years ago
Alexander Strizhakov	91870c8995	adding rss for user feed	5 years ago
Alexander Strizhakov	26e2076659	fix for feed page pagination	5 years ago