Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								62e5ff624e
								
							
						 | 
						
							
							
								
								user: add is_internal_user? helper function
							
							
							
							
							
						 | 
						
							2019-07-17 17:12:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								4885473be2
								
							
						 | 
						
							
							
								
								user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
							
							
							
							
							
						 | 
						
							2019-07-17 16:03:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								c32384c1ea
								
							
						 | 
						
							
							
								
								tests for Pleroma.Signature
							
							
							
							
							
						 | 
						
							2019-07-15 13:01:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7c39b7ac8
								
							
						 | 
						
							
							
								
								Feature/1072 muting notifications
							
							
							
							
							
						 | 
						
							2019-07-14 13:29:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								beba7bbc85
								
							
						 | 
						
							
							
								
								removing synchronization worker
							
							
							
							
							
						 | 
						
							2019-07-10 17:42:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								f8786fa6f2
								
							
						 | 
						
							
							
								
								adding following_address field to user
							
							
							
							
							
						 | 
						
							2019-07-10 17:42:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d2b50ccca
								
							
						 | 
						
							
							
								
								Send and handle "Delete" activity for deleted users
							
							
							
							
							
						 | 
						
							2019-07-10 05:16:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6b0fce6e9
								
							
						 | 
						
							
							
								
								Fix/1019 correct count remote users
							
							
							
							
							
						 | 
						
							2019-07-09 17:36:35 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								6dadf5d6f4
								
							
						 | 
						
							
							
								
								[#1043] fix search accounts.
							
							
							
							
							
						 | 
						
							2019-07-05 04:22:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								a0c4ebb4d7
								
							
						 | 
						
							
							
								
								[#184] small refactoring  reset password
							
							
							
							
							
						 | 
						
							2019-06-24 19:01:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c63c67512
								
							
						 | 
						
							
							
								
								Rework user deletion
							
							
							
							
							
						 | 
						
							2019-06-24 18:59:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c2ca1f22a2
								
							
						 | 
						
							
							
								
								it is changed in compile time
							
							
							
							
							
							
							
							we can't change module attributes and endpoint settings in runtime 
							
						 | 
						
							2019-06-14 15:45:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								3f6da9c45a
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
							
							
							
							
							
							
							
							Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250 
							
						 | 
						
							2019-06-05 15:52:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								a511d2f900
								
							
						 | 
						
							
							
								
								Merge branch 'improve-search' into 'develop'
							
							
							
							
							
							
							
							[#943] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220 
							
						 | 
						
							2019-06-05 15:51:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								076c9ae40e
								
							
						 | 
						
							
							
								
								User: Remove superfluous maybe_follow.
							
							
							
							
							
						 | 
						
							2019-06-05 14:24:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								024dfdc39c
								
							
						 | 
						
							
							
								
								Typo + Linting.
							
							
							
							
							
						 | 
						
							2019-06-05 12:45:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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. 
							
						 | 
						
							2019-06-05 12:06:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								1cb245c982
								
							
						 | 
						
							
							
								
								Fix formatting
							
							
							
							
							
						 | 
						
							2019-06-05 16:55:17 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5b04f07a1e
								
							
						 | 
						
							
							
								
								Limit search for unauthenticated users to local users only
							
							
							
							
							
						 | 
						
							2019-06-05 16:51:04 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b664b048e
								
							
						 | 
						
							
							
								
								User: Add function to get AP ids from nicknames.
							
							
							
							
							
						 | 
						
							2019-06-03 18:16:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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/ 
							
						 | 
						
							2019-05-31 18:46:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								99f70c7e20
								
							
						 | 
						
							
							
								
								Use Pleroma.Config everywhere
							
							
							
							
							
						 | 
						
							2019-05-30 15:33:58 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								045803346d
								
							
						 | 
						
							
							
								
								move key generation functions into Pleroma.Keys module
							
							
							
							
							
						 | 
						
							2019-05-22 03:58:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								daeae8e2e7
								
							
						 | 
						
							
							
								
								Move default mascot configuration to config/
							
							
							
							
							
						 | 
						
							2019-05-20 16:12:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								249b31ffe5
								
							
						 | 
						
							
							
								
								Fix specs.
							
							
							
							
							
						 | 
						
							2019-05-17 11:49:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ed682213f
								
							
						 | 
						
							
							
								
								Fix/902 random compile failing
							
							
							
							
							
						 | 
						
							2019-05-17 07:25:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c303afc8b
								
							
						 | 
						
							
							
								
								Remove duplicated entries in users' following lists
							
							
							
							
							
						 | 
						
							2019-05-16 20:04:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								73ae58fdfa
								
							
						 | 
						
							
							
								
								Feature/896 toggling confirmation
							
							
							
							
							
						 | 
						
							2019-05-16 13:23:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								1caa6331ea
								
							
						 | 
						
							
							
								
								Group def perform() together to fix the build
							
							
							
							
							
						 | 
						
							2019-05-14 12:33:03 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								692919c7d2
								
							
						 | 
						
							
							
								
								Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
							
							
							
							
							
							
							
							use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142 
							
						 | 
						
							2019-05-14 15:27:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								ac3a3abf6b
								
							
						 | 
						
							
							
								
								clean up follow/block imports a little
							
							
							
							
							
						 | 
						
							2019-05-14 15:07:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								b92c004ea8
								
							
						 | 
						
							
							
								
								Reuse query from User.restrict_deactivated/1
							
							
							
							
							
						 | 
						
							2019-05-14 18:29:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								5e2b491276
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
							
							
							
							
							
						 | 
						
							2019-05-14 18:15:56 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								69a9e0563c
								
							
						 | 
						
							
							
								
								user: migrate follow/blocks import to job queue
							
							
							
							
							
						 | 
						
							2019-05-13 19:36:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								32d4630c9c
								
							
						 | 
						
							
							
								
								user: move initial post fetching to job queue
							
							
							
							
							
						 | 
						
							2019-05-13 19:36:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2be420f94
								
							
						 | 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal
							
							
							
							
							
							
							
							[ci skip] 
							
						 | 
						
							2019-05-13 18:35:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								bfeb33e951
								
							
						 | 
						
							
							
								
								Merge develop
							
							
							
							
							
							
							
							Merge conflict in lib/pleroma/activity.ex 
							
						 | 
						
							2019-05-08 14:34:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								06947c9147
								
							
						 | 
						
							
							
								
								Remove bookmarks assoc
							
							
							
							
							
						 | 
						
							2019-05-07 19:33:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								1557b99beb
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
							
							
							
							
							
						 | 
						
							2019-05-07 16:51:11 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ce6ca0fefe
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
							
							
							
							
							
						 | 
						
							2019-05-06 16:45:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d70af32127
								
							
						 | 
						
							
							
								
								Pleroma.User: remove emojify on parse_bio
							
							
							
							
							
						 | 
						
							2019-05-03 16:27:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								f11e7037c2
								
							
						 | 
						
							
							
								
								test fixes
							
							
							
							
							
						 | 
						
							2019-05-01 16:09:53 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								bdfa3a6fa8
								
							
						 | 
						
							
							
								
								Merging with develop
							
							
							
							
							
							
							
							Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex 
							
						 | 
						
							2019-05-01 12:29:33 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								229ce6abbc
								
							
						 | 
						
							
							
								
								migration without using old field name
							
							
							
							
							
							
							
							removing old field from db, after bookmarks migration 
							
						 | 
						
							2019-04-25 13:42:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								c157e27a00
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/disable-account
							
							
							
							
							
						 | 
						
							2019-04-25 13:41:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								324c9c8ab5
								
							
						 | 
						
							
							
								
								migrate user.bookmarks to separate table
							
							
							
							
							
						 | 
						
							2019-04-25 13:38:24 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								73d01857e3
								
							
						 | 
						
							
							
								
								bookmarks in separate table
							
							
							
							
							
						 | 
						
							2019-04-25 13:38:24 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9cdf6d3b9
								
							
						 | 
						
							
							
								
								Use User.get_cached* everywhere
							
							
							
							
							
						 | 
						
							2019-04-22 07:20:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8c2f9a73a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
							
							
							
							
							
						 | 
						
							2019-04-22 13:08:30 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sadposter
								
							 
						 | 
						
							
							
							
							
								
							
							
								e513504e88
								
							
						 | 
						
							
							
								
								Revert "Assert on the success of enqueue before returning"
							
							
							
							
							
							
							
							This reverts commit 16d8c8b33b.
Because it breaks everything 
							
						 | 
						
							2019-04-14 16:12:54 +01:00 | 
						
						
							
							
							
								
							
							
						 |