rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								942d7467ca 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into features/remove-user-source_data  
							
							
							
						 
						
							2020-04-16 21:28:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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  
							
						 
						
							2020-04-16 14:59:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5e365448f3 
								
							 
						 
						
							
							
								
								Merge branch 'following-relationships-optimizations' into 'develop'  
							
							... 
							
							
							
							FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332  
							
						 
						
							2020-04-11 19:46:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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. 
							
						 
						
							2020-04-11 22:31:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf2a0574e7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/support-conversations-pagination  
							
							
							
						 
						
							2020-04-10 14:18:57 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								4d33e0bd50 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/apc2s_upload_activity' into 'develop'  
							
							... 
							
							
							
							bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316  
							
						 
						
							2020-04-10 04:31:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e89078ac2a 
								
							 
						 
						
							
							
								
								User: remove source_data  
							
							
							
						 
						
							2020-04-10 06:20:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3420dec494 
								
							 
						 
						
							
							
								
								Remove User.fields/1  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9172d719cc 
								
							 
						 
						
							
							
								
								profile emojis in User.emoji instead of source_data  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62656ab259 
								
							 
						 
						
							
							
								
								User: Move inbox & shared_inbox to own fields  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6bed1a284 
								
							 
						 
						
							
							
								
								Types.URI: New  
							
							
							
						 
						
							2020-04-10 06:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								19eedb3d04 
								
							 
						 
						
							
							
								
								User: Move public_key from source_data to own field  
							
							
							
						 
						
							2020-04-10 06:16:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c401b00c78 
								
							 
						 
						
							
							
								
								ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}  
							
							
							
						 
						
							2020-04-09 04:36:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								349b9d86dc 
								
							 
						 
						
							
							
								
								Merge branch 'remake-remodel-2' into 'develop'  
							
							... 
							
							
							
							Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315  
							
						 
						
							2020-04-06 11:59:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								772bc258cd 
								
							 
						 
						
							
							
								
								ObjectID Validator: Refactor.  
							
							
							
						 
						
							2020-04-06 13:53:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e67cde0ed6 
								
							 
						 
						
							
							
								
								Transmogrifier: Refactoring / Renaming.  
							
							
							
						 
						
							2020-04-06 13:46:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								ef7d2b0f11 
								
							 
						 
						
							
							
								
								Merge branch 'gun' into 'develop'  
							
							... 
							
							
							
							Gun adapter
Closes  #945 
See merge request pleroma/pleroma!1861  
							
						 
						
							2020-04-01 17:05:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								037b49c415 
								
							 
						 
						
							
							
								
								Validators: Correct ObjectID filename  
							
							
							
						 
						
							2020-04-01 16:10:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								185520d1b4 
								
							 
						 
						
							
							
								
								Provide known-good user.uri, remove User.profile_url/1  
							
							
							
						 
						
							2020-03-31 23:55:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c982093cc2 
								
							 
						 
						
							
							
								
								Transmogrifier: Fix BAD code by RINPATCH  
							
							
							
						 
						
							2020-03-31 19:33:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1b323ce1c6 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2020-03-31 17:28:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ecac57732a 
								
							 
						 
						
							
							
								
								Transmogrifier: Only add context if it really is onne.  
							
							
							
						 
						
							2020-03-31 19:16:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								288f2b5a7c 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2020-03-31 17:00:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0be1fa0a86 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2020-03-31 17:00:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								643f15e77b 
								
							 
						 
						
							
							
								
								Validators: ObjectID is an http uri.  
							
							
							
						 
						
							2020-03-31 16:11:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f6835333be 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2020-03-31 12:55:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9c94b6a327 
								
							 
						 
						
							
							
								
								[ #2332 ] Misc. fixes per code change requests.  
							
							
							
						 
						
							2020-03-30 19:08:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b607ae1a1c 
								
							 
						 
						
							
							
								
								removing grouped reports admin api endpoint  
							
							
							
						 
						
							2020-03-30 13:51:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f497cf2f7c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-30 12:15:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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  
							
						 
						
							2020-03-29 19:18:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								be9d18461a 
								
							 
						 
						
							
							
								
								FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).  
							
							
							
						 
						
							2020-03-28 18:49:03 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29ab1d9f8d 
								
							 
						 
						
							
							
								
								Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2  
							
							
							
						 
						
							2020-03-26 17:24:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								69fc1dd69f 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex  
							
							
							
						 
						
							2020-03-26 14:45:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0c60c0a76a 
								
							 
						 
						
							
							
								
								Validators: Use correct type for IDs.  
							
							
							
						 
						
							2020-03-26 15:44:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0adaab8e75 
								
							 
						 
						
							
							
								
								Bump copyright dates.  
							
							
							
						 
						
							2020-03-26 15:37:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								eaacc64839 
								
							 
						 
						
							
							
								
								Refactors.  
							
							
							
						 
						
							2020-03-26 15:33:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ee979dd6d7 
								
							 
						 
						
							
							
								
								Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2  
							
							
							
						 
						
							2020-03-26 15:24:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d7aa0b645b 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex  
							
							
							
						 
						
							2020-03-26 14:23:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4cf1007a7d 
								
							 
						 
						
							
							
								
								ActivityPub: Small refactor.  
							
							
							
						 
						
							2020-03-26 15:16:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								012d428e1f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control  
							
							
							
						 
						
							2020-03-25 09:05:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e743c22329 
								
							 
						 
						
							
							
								
								Fixed incorrect usage of "relations" as a short form of "relationships".  
							
							
							
						 
						
							2020-03-25 09:04:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f316882464 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex  
							
							
							
						 
						
							2020-03-24 18:37:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aaf00f1ff5 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex  
							
							
							
						 
						
							2020-03-24 18:24:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								74560e888e 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex  
							
							
							
						 
						
							2020-03-24 18:20:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a2538967c 
								
							 
						 
						
							
							
								
								Support pagination in conversations  
							
							
							
						 
						
							2020-03-24 20:18:27 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1a9716a98 
								
							 
						 
						
							
							
								
								Fix activity deletion  
							
							
							
						 
						
							2020-03-24 17:38:18 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								981e015f1b 
								
							 
						 
						
							
							
								
								Mastodon API Account view: Remove an outdated hack  
							
							... 
							
							
							
							The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary. 
							
						 
						
							2020-03-22 17:10:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9bae9b1b1b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into gun  
							
							
							
						 
						
							2020-03-20 20:47:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe15f0ba15 
								
							 
						 
						
							
							
								
								restrict_unauthenticated setting  
							
							
							
						 
						
							2020-03-20 16:36:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c1fd4f6653 
								
							 
						 
						
							
							
								
								transmogrifier.ex: rework fix_attachment for better IR  
							
							
							
						 
						
							2020-03-19 19:10:03 +01:00