pleroma - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2020-03-20	Improved in-test `clear_config/n` applicability (setup / setup_all / in-test ↵	Ivan Tashkinov
	usage).
2020-03-20	Merge remote-tracking branch 'remotes/origin/develop' into ↵	Ivan Tashkinov
	clear-config-test-improvements # Conflicts: # test/web/mastodon_api/controllers/account_controller_test.exs
2020-03-20	restrict_unauthenticated setting	Alexander Strizhakov

2020-03-18	Improved in-test config management functions.	Ivan Tashkinov

2020-03-13	rate limiter: disable based on if remote ip was found, not on if the plug ↵	rinpatch
	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-02	Merge branch 'develop' into fix/signup-without-email	Egor Kislitsyn

2020-03-02	Bump copyright years of files changed after 2020-01-07	Haelwenn (lanodan) Monnier
	Done via the following command: git diff fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only \| xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-02-27	Runtime configurability of RateLimiter. Refactoring. Disabled default rate ↵	Ivan Tashkinov
	limits in tests.
2020-02-26	Allow account registration without an email	Egor Kislitsyn

2020-02-13	Tweaks to `clear_config` calls in tests in order to prevent side effects on ↵	Ivan Tashkinov
	config during test suite execution.
2020-02-05	Add support for cancellation of a follow request	Egor Kislitsyn

2020-01-30	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	rinpatch

2019-12-19	[#2068] Introduced proper OAuth tokens usage to controller tests.	Ivan Tashkinov

2019-12-14	Disable rate limiter for socket/localhost (unless RemoteIp is enabled)	Maxim Filippov

2019-12-06	ActivityPub: For user timelines, respects blocks.	lain
	Unless the timeline belongs to a blocked user.
2019-11-21	Merge remote-tracking branch 'remotes/upstream/develop' into ↵	Ivan Tashkinov
	1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs
2019-11-19	[#1335] Implemented notification mutes and reblog mutes as ↵	Ivan Tashkinov
	UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-15	[#1335] Reorganized `users.mutes` as relation to UserMute entity.	Ivan Tashkinov

2019-11-10	[#1335] User: refactored :blocks field into :blocked_users relation.	Ivan Tashkinov
	Introduced UserBlock.
2019-11-04	excluded invisible actors from gets /api/v1/accounts/:id	Maksim Pechnikov

2019-10-24	Merge remote-tracking branch 'upstream/develop' into ↵	Egor Kislitsyn
	refactor/following-relationships
2019-10-21	Merge branch 'develop' into refactor/following-relationships	Egor Kislitsyn

2019-10-20	Merge remote-tracking branch 'remotes/upstream/develop' into ↵	Ivan Tashkinov
	1304-user-info-deprecation # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs
2019-10-16	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	Ivan Tashkinov

2019-10-14	Mastodon API: Add `exclude_visibilities` parameter to the timeline and ↵	eugenijm
	notification endpoints
2019-10-11	Replace `user.following` with Pleroma.FollowingRelationship	Egor Kislitsyn

2019-10-02	Move `follows`, `mutes` and `blocks` actions to AccountController	Egor Kislitsyn

2019-09-30	Move account_register, relationships and verify_credentials to ↵	Egor Kislitsyn
	MastodonAPI.AccountController
2019-09-30	Add PleromaAPI.AccountController	Egor Kislitsyn

2019-09-30	Fix merge	Egor Kislitsyn