709 Commits (d48755791ddfea0b30bc5a843dfc4181efd63982)

Author	SHA1	Message	Date
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	5 years ago
Maksim Pechnikov	a52da55eb9	added User.NotificationSetting struct	5 years ago
Sadposter	c7cc80a9ee	obligatory format commit	5 years ago
Sadposter	fa97eddf8a	make follows take precedence over domain blocks	5 years ago
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	5 years ago
Ivan Tashkinov	c8d3c3bfec	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex	5 years ago
Ivan Tashkinov	1636cc5b7e	Removed users.info and remaining usages.	5 years ago
lain	bd62946020	Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' ... AdminAPI: Confirm user account, resend confirmation email See merge request pleroma/pleroma!1994	5 years ago
Maxim Filippov	b64c7b35d4	Swap map with each	5 years ago
Ivan Tashkinov	cad9b325e5	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user/search.ex # test/user_test.exs	5 years ago
lain	8feb5dcb42	Merge branch 'issue/1348' into 'develop' ... [#1348] excluded invisible actors from gets /api/v1/accounts/:id See merge request pleroma/pleroma!1937	5 years ago
Egor Kislitsyn	d38ab4bb89	Fix user.following_count	5 years ago
Ivan Tashkinov	de892d2fe1	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	5 years ago
Ivan Tashkinov	555edd01ab	[#1335] User AP ID relations fetching performance optimizations.	5 years ago
Ivan Tashkinov	ba5cc30165	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	5 years ago
Maxim Filippov	46eb160135	AdminAPI: Confirm user account, resend confirmation email	5 years ago
Ivan Tashkinov	aad6576130	[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.	5 years ago
Ivan Tashkinov	01d9c093c3	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations	5 years ago
Ivan Tashkinov	c31ddce51e	[#1335] Reorganized `users.mutes` as relation to UserMute entity.	5 years ago
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	5 years ago
Egor Kislitsyn	e6d7e27bd6	Add `allow_following_move` setting to User	5 years ago
lain	8521553ad9	User: Don't let deactivated users authenticate.	5 years ago
Ivan Tashkinov	5cf2c7422b	[#1335] Applied code review suggestions.	5 years ago
Ivan Tashkinov	3db988250b	[#1335] User: refactored :blocks field into :blocked_users relation. ... Introduced UserBlock.	5 years ago
Maksim Pechnikov	4b7c11e3f9	excluded invisible actors from gets /api/v1/accounts/:id	5 years ago
lain	0c31258616	User: Don't pull remote users follower count immediately after deactivating. ... The other instance doesn't necessarily know that anything changed yet, and it will be fixed up at the next user pull anyway. Closes #1369	5 years ago
Egor Kislitsyn	4270861085	Merge branch 'develop' into feature/move-activity	5 years ago
lain	2480200759	Merge branch 'refactor/following-relationships' into 'develop' ... Move following relationships to a separate table Closes #1233 See merge request pleroma/pleroma!1814	5 years ago
eugenijm	0580654485	Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`. ... Since the conversations with the blocked user are invisible, they are excluded from the blocking user's `unread_conversation_count`.	5 years ago
Egor Kislitsyn	b777083f3f	Add `also_known_as` field to Pleroma.User	5 years ago
Egor Kislitsyn	dbee53c2df	Remove unused Pleroma.User.info_fields/0	5 years ago
Egor Kislitsyn	4c1dd55c48	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	5 years ago
Ivan Tashkinov	11cd994425	[#1304] Fixed null::jsonb handling in User.Info migration.	5 years ago
Ivan Tashkinov	7c7f90bc4f	[#1304] Merged `develop`, handled User.Info.invisible.	5 years ago
Ivan Tashkinov	a11a7176d5	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation ... # Conflicts: # lib/pleroma/user/info.ex # lib/pleroma/web/activity_pub/activity_pub.ex # lib/pleroma/web/activity_pub/transmogrifier.ex	5 years ago
Egor Kislitsyn	4ea1a61b00	Merge branch 'develop' into refactor/following-relationships	5 years ago
Ivan Tashkinov	ee04fbc35a	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.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	5 years ago
Ivan Tashkinov	c6fdfbc4f1	Merge remote-tracking branch 'remotes/upstream/develop' into 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	5 years ago
Ivan Tashkinov	b4cbf0568b	[#1304] Analysis issue fix.	5 years ago
Ivan Tashkinov	e8843974cb	[#1304] Moved remaining fields from User.Info to User. ... Misc. fixes / improvements.	5 years ago
Ariadne Conill	95871cb462	user: implement User.invisible?/1	5 years ago
Ariadne Conill	d379b48769	kill almost all of the OStatus module	5 years ago
Ariadne Conill	4f82e42e4e	websub: remove entirely	5 years ago
rinpatch	39e996528c	Fix a migration wiping user info of users that don't have any mutes ... And introduce safe_jsonb_set	5 years ago
Ivan Tashkinov	10ff01acd9	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	5 years ago
feld	21f0757b0d	Merge branch 'feature/multiple-users-activation-permissions' into 'develop' ... Ability to toggle activation status, permission group & delete multiple users Closes admin-fe#39 See merge request pleroma/pleroma!1825	5 years ago
Maxim Filippov	da0e4879bc	DELETE /api/pleroma/admin/users now accepts nicknames array	5 years ago
Egor Kislitsyn	059005ff82	Replace `user.following` with Pleroma.FollowingRelationship	5 years ago
lain	c54ae662dc	Merge remote-tracking branch 'origin/develop' into benchmark-finishing	5 years ago
Maxim Filippov	ad42837244	Ability to toggle activation status and permission group for a group of users	5 years ago
rinpatch	fefbd31c6e	Move local keys out of `user.info`	5 years ago
eugenijm	8249924485	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	5 years ago
kaniini	e07e9cb75e	Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" ... This reverts merge request !1737	5 years ago
kaniini	5c04e81724	Merge branch 'user-info-unread-direct-conversation' into 'develop' ... Add the `unread_conversation_count` field to the user info See merge request pleroma/pleroma!1737	5 years ago
rinpatch	8217292085	Fix get_cached_by_nickname_or_id not allowing to get local users by ... nickname Closes #1293	5 years ago
eugenijm	06d9df79c5	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	5 years ago
Maksim Pechnikov	3d722dc200	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
kaniini	48a82c4609	Merge branch 'refactor/user' into 'develop' ... Simplify updating user's `info` See merge request pleroma/pleroma!1712	5 years ago
kaniini	3ff57f1fd3	Merge branch 'hex-flake-id' into 'develop' ... Replace `Pleroma.FlakeId` with `flake_id` hex package See merge request pleroma/pleroma!1692	5 years ago
Egor Kislitsyn	b5dfe83433	Replace `Pleroma.FlakeId` with `flake_id` hex package	5 years ago
Egor Kislitsyn	1bea67cb5e	Cleanup Pleroma.User	5 years ago
Egor Kislitsyn	209395c7e6	Add User.change_info/2 and User.update_info/2	5 years ago
Egor Kislitsyn	79b25be4e1	Do not return tuple when unneeded	5 years ago
Maksim Pechnikov	d75d0ae134	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Maksim Pechnikov	179fa32dd5	Merge branch 'develop' into tests/mastodon_api_controller.ex	5 years ago
Maxim Filippov	6f25668215	Admin API: Add ability to force user's password reset	5 years ago
rinpatch	95a4a19417	Merge branch 'support/tests' into 'develop' ... add tests for activity_pub/utils.ex See merge request pleroma/pleroma!1627	5 years ago
kaniini	17142a3720	Merge branch 'feature/delivery-tracking' into 'develop' ... Track signed fetches of objects and use them for delete federation See merge request pleroma/pleroma!1661	5 years ago
Maksim Pechnikov	8751809e1e	Merge branch 'develop' into support/tests	5 years ago
Ivan Tashkinov	610236d6be	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md	5 years ago
rinpatch	62bbba80f3	Merge branch 'fix/truncate-remote-user-fields' into 'develop' ... Truncate remote user fields See merge request pleroma/pleroma!1619	5 years ago
Ivan Tashkinov	6bcedb693c	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # docs/config.md # mix.lock	5 years ago
rinpatch	ba70a8cae6	Merge branch 'develop' into feature/delivery-tracking	5 years ago
lain	53a3ad6043	Merge branch 'cleanup-activity' into 'develop' ... Cleanup `Pleroma.Activity` and add more tests See merge request pleroma/pleroma!1623	5 years ago
rinpatch	ce23529d91	Use delivery info when federating deletes	5 years ago
Egor Kislitsyn	25d8216804	Add email change endpoint	5 years ago
Egor Kislitsyn	39dc9b470c	Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils	5 years ago
rinpatch	769fb778d4	Track object/create activity fetches	5 years ago
Maksim Pechnikov	39f99dc6cd	Merge branch 'develop' into support/tests	5 years ago
Maksim Pechnikov	ab2f21e470	tests for mastodon_api_controller.ex	5 years ago
Alex S	b3f6f6a409	generating remote users	5 years ago
Ivan Tashkinov	ca1ba1e272	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # test/web/twitter_api/twitter_api_controller_test.exs	5 years ago
rinpatch	26fe6f70c9	Move checking for restrict_local to User.get_cached_by_id_or_nickname	5 years ago
Sadposter	cb99cfcc65	don't try to truncate non-strings	5 years ago
Sadposter	2975da284b	truncate remote user bio/display name	5 years ago
Maksim Pechnikov	8cbad5500c	add tests for activity_pub/utils.ex	5 years ago
rinpatch	cc1d1ee406	Mastdon API: Add ability to get a remote account by nickname to ... `/api/v1/accounts/:id`	5 years ago
Ivan Tashkinov	dd017c65a4	[#1149] Refactored Oban workers API (introduced `enqueue/3`).	5 years ago
Ivan Tashkinov	a90ea8ba15	[#1149] Addressed code review comments (code style, jobs pruning etc.).	5 years ago
Ivan Tashkinov	e890ea7e82	[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # config/config.exs	5 years ago
lain	90986667ce	Merge branch 'admin-create-users' into 'develop' ... user creation admin api will create multiple users See merge request pleroma/pleroma!1170	5 years ago
Ivan Tashkinov	256ff09aa8	[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue ... # Conflicts: # lib/pleroma/application.ex # lib/pleroma/scheduled_activity_worker.ex # lib/pleroma/web/federator/retry_queue.ex # lib/pleroma/web/oauth/token/clean_worker.ex # test/user_test.exs # test/web/federator_test.exs	5 years ago
lain	ef43016b2c	Merge branch 'feature/custom-fields' into 'develop' ... Add custom profile fields See merge request pleroma/pleroma!1488	5 years ago
lain	49ae3191df	Merge branch 'hotfix/user_unfollow' into 'develop' ... [#1177] fixed User.unfollow with synchronization external user See merge request pleroma/pleroma!1579	5 years ago
Sadposter	94e336d9d5	clear follow requests when blocking a user	5 years ago
Maksim Pechnikov	3315a2a1c3	fixed User.unfollow with synchronization external user	5 years ago
lain	7ab2dbbdb6	Merge branch 'pleroma-conversations' into 'develop' ... Extended Pleroma Conversations See merge request pleroma/pleroma!1535	5 years ago
rinpatch	bd5ad0af78	Cache follow state	5 years ago
Ivan Tashkinov	8778c16dac	Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue	5 years ago
lain	560dbad538	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	5 years ago
Egor Kislitsyn	e457fcc479	Add `:max_remote_account_fields` config option	5 years ago
rinpatch	83a3de8cc4	Merge branch 'length-limit-bio' into 'develop' ... Add configurable length limits for `User.bio` and `User.name` See merge request pleroma/pleroma!1515	5 years ago
Ivan Tashkinov	0e1c481a94	[#1149] Added more oban workers. Refactoring.	5 years ago
lain	a2b98f6d58	Merge remote-tracking branch 'origin/develop' into pleroma-conversations	5 years ago
Roman Chvanikov	9d4f34fbcb	Merge branch 'develop' into feature/digest-email	5 years ago
lain	5ff8f07ca9	Merge branch 'feature/hide-follows-remote' into 'develop' ... Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users See merge request pleroma/pleroma!1411	5 years ago
lain	f88560accd	Conversations: Add recipient list to conversation participation. ... This enables to address the same group of people every time.	5 years ago
Egor Kislitsyn	9ca4506355	Add configurable length limits for `User.bio` and `User.name`	5 years ago
rinpatch	301ea0dc04	Add tests for counters being updated on follow	5 years ago
Maksim	58443d0cd6	tests for TwitterApi/UtilController	5 years ago
rinpatch	f42719506c	Fix credo issues	5 years ago
rinpatch	c88a5d3251	Merge branch 'develop' into feature/hide-follows-remote	5 years ago
Maksim	6a4b8b2681	fixed User.update_and_set_cache for stale user	5 years ago
rinpatch	41e0304757	Merge branch 'develop' into feature/hide-follows-remote	5 years ago
Eugenij	4504135894	Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)	5 years ago
Roman Chvanikov	d2da3d30f3	Merge branch 'develop' into feature/digest-email	5 years ago
Maksim	c49a09ed88	tests for Pleroma.Web.ActivityPub.Publisher	5 years ago
Sadposter	54a161cb7a	move unauth'd user blocks?/2 check	5 years ago
Alexander Strizhakov	b70e659304	Feature/1087 wildcard option for blocks	5 years ago
rinpatch	196cad46f3	Resolve merge conflicts	5 years ago
rinpatch	d4ee76ab63	Apply suggestion to lib/pleroma/user.ex	5 years ago
Roman Chvanikov	8292331b35	Merge branch 'develop' into feature/digest-email	5 years ago
Ivan Tashkinov	d0198fe215	[#1112] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.	5 years ago
Roman Chvanikov	36049f08ef	Merge develop	5 years ago
Ariadne Conill	62e5ff624e	user: add is_internal_user? helper function	5 years ago
Ariadne Conill	4885473be2	user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()	5 years ago
Roman Chvanikov	9bca70b10a	Merge develop	5 years ago
Maksim	c32384c1ea	tests for Pleroma.Signature	5 years ago
Roman Chvanikov	c729883936	Merge branch 'develop' into feature/digest-email	5 years ago
Alexander Strizhakov	e7c39b7ac8	Feature/1072 muting notifications	5 years ago
rinpatch	0c2dcb4c69	Add follow information refetching after following/unfollowing	5 years ago
rinpatch	e8fa477793	Refactor Follows/Followers counter syncronization ... - Actually sync counters in the database instead of info cache (which got overriden after user update was finished anyway) - Add following count field to user info - Set hide_followers/hide_follows for remote users based on http status codes for the first collection page	5 years ago
Roman Chvanikov	eae991b06a	merge develop	5 years ago
Alex S	beba7bbc85	removing synchronization worker	5 years ago
Alex S	f8786fa6f2	adding following_address field to user	5 years ago
Sergey Suprunenko	2d2b50ccca	Send and handle "Delete" activity for deleted users	5 years ago
Roman Chvanikov	371d39e160	Merge develop	5 years ago
Alexander Strizhakov	d6b0fce6e9	Fix/1019 correct count remote users	5 years ago
Maksim	6dadf5d6f4	[#1043] fix search accounts.	5 years ago
Roman Chvanikov	657277ffc0	Resolve conflicts	5 years ago
Maksim	a0c4ebb4d7	[#184] small refactoring reset password	5 years ago
Sergey Suprunenko	2c63c67512	Rework user deletion	5 years ago
Alexander Strizhakov	c2ca1f22a2	it is changed in compile time ... we can't change module attributes and endpoint settings in runtime	5 years ago
Roman Chvanikov	01fe5abad1	Resolve conflicts	5 years ago
kaniini	3f6da9c45a	Merge branch 'bugfix/377-stuck-follow-request' into 'develop' ... Bugfix/377 stuck follow request Closes #377 See merge request pleroma/pleroma!1250	5 years ago
kaniini	a511d2f900	Merge branch 'improve-search' into 'develop' ... [#943] Contain search for unauthenticated users See merge request pleroma/pleroma!1220	5 years ago
lain	076c9ae40e	User: Remove superfluous `maybe_follow`.	5 years ago
lain	024dfdc39c	Typo + Linting.	5 years ago
lain	8b9a0dd4a7	User: Don't error out when following a user that's already followed. ... This leads to a few situations where it is impossible to follow a user.	5 years ago
Egor Kislitsyn	1cb245c982	Fix formatting	5 years ago
Egor Kislitsyn	5b04f07a1e	Limit search for unauthenticated users to local users only	5 years ago
Mark Felder	6ef145b4fc	Merge branch 'develop' into feature/digest-email	5 years ago
lain	2b664b048e	User: Add function to get AP ids from nicknames.	5 years ago
Sachin Joshi	ad5263c647	Merge remote-tracking branch 'upstream/develop' into admin-create-users	5 years ago
Sachin Joshi	5534d4c676	make bulk user creation from admin works as a transaction	5 years ago
feld	6872c5f88f	Mastodon API search default value for "resolve" is false ... https://docs.joinmastodon.org/api/rest/accounts/ https://docs.joinmastodon.org/api/rest/search/	5 years ago
Egor Kislitsyn	99f70c7e20	Use Pleroma.Config everywhere	5 years ago
Roman Chvanikov	ce47017c89	Merge develop	5 years ago
William Pitcock	045803346d	move key generation functions into Pleroma.Keys module	5 years ago
Sadposter	daeae8e2e7	Move default mascot configuration to `config/`	5 years ago
lain	249b31ffe5	Fix specs.	5 years ago
Alexander Strizhakov	7ed682213f	Fix/902 random compile failing	5 years ago
Sergey Suprunenko	2c303afc8b	Remove duplicated entries in users' following lists	5 years ago
Alexander Strizhakov	73ae58fdfa	Feature/896 toggling confirmation	5 years ago
Mark Felder	1caa6331ea	Group def perform() together to fix the build	5 years ago
lambda	692919c7d2	Merge branch 'refactor/use-job-queue-everywhere' into 'develop' ... use job queue everywhere Closes #862 See merge request pleroma/pleroma!1142	5 years ago
William Pitcock	ac3a3abf6b	clean up follow/block imports a little	5 years ago
Egor Kislitsyn	b92c004ea8	Reuse query from User.restrict_deactivated/1	5 years ago
Egor Kislitsyn	5e2b491276	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
William Pitcock	69a9e0563c	user: migrate follow/blocks import to job queue	5 years ago
William Pitcock	32d4630c9c	user: move initial post fetching to job queue	5 years ago
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	5 years ago
Roman Chvanikov	f1f7a11222	Merge develop	5 years ago
Alexander Strizhakov	bfeb33e951	Merge develop ... Merge conflict in lib/pleroma/activity.ex	5 years ago
Roman Chvanikov	b6b5b16ba4	Merge develop	5 years ago
rinpatch	06947c9147	Remove bookmarks assoc	5 years ago
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Alexander Strizhakov	ce6ca0fefe	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion	5 years ago
Haelwenn (lanodan) Monnier	d70af32127	Pleroma.User: remove emojify on parse_bio	5 years ago
Alex S	f11e7037c2	test fixes	5 years ago
Alex S	bdfa3a6fa8	Merging with develop ... Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex	5 years ago
Roman Chvanikov	0f0cc2703b	Merge develop	5 years ago
Alex S	229ce6abbc	migration without using old field name ... removing old field from db, after bookmarks migration	5 years ago
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	5 years ago
Alex S	324c9c8ab5	migrate user.bookmarks to separate table	5 years ago
Alex S	73d01857e3	bookmarks in separate table	5 years ago
Egor	b9cdf6d3b9	Use `User.get_cached*` everywhere	5 years ago
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Roman Chvanikov	64a2c6a041	Digest emails	6 years ago
Roman Chvanikov	bc7862106d	Fix tests	6 years ago
Roman Chvanikov	8add119444	Add User.list_inactive_users_query/1	6 years ago
Roman Chvanikov	2f0203a4a1	Resolve conflicts	6 years ago
Sadposter	e513504e88	Revert "Assert on the success of enqueue before returning" ... This reverts commit 16d8c8b33b. Because it breaks everything	6 years ago
Sadposter	16d8c8b33b	Assert on the success of enqueue before returning	6 years ago
Sadposter	5e45557751	Always return {atom, _} from try_send_confirmation	6 years ago
Sadposter	ec42b639a3	fix pattern match on user registration ... deliver_async will return a single atom	6 years ago
lambda	184ae60b21	Merge branch 'bugfix/pleroma-email-naming' into 'develop' ... Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029	6 years ago
Egor Kislitsyn	dd097a406b	add tests	6 years ago
Egor Kislitsyn	46bd5c1d87	fix format	6 years ago
Egor Kislitsyn	db4badc6aa	move user disable into deactivation	6 years ago