rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8addbd948c 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/announce-race-condition' into 'develop'  
							
							... 
							
							
							
							Announcements: Prevent race condition.
See merge request pleroma/pleroma!2423  
							
						 
						
							2020-04-24 16:58:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d89cd0a197 
								
							 
						 
						
							
							
								
								Reply Filtering: Refactor.  
							
							
							
						 
						
							2020-04-24 18:25:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e625a427c 
								
							 
						 
						
							
							
								
								reply filtering  
							
							
							
						 
						
							2020-04-24 15:43:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cb12585098 
								
							 
						 
						
							
							
								
								Announcements: Prevent race condition.  
							
							
							
						 
						
							2020-04-24 14:37:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1df6af2a4c 
								
							 
						 
						
							
							
								
								Credo fixes.  
							
							
							
						 
						
							2020-04-24 13:59:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								bbf8554c97 
								
							 
						 
						
							
							
								
								ActivitPub: Remove like function.  
							
							... 
							
							
							
							We don't need another way to build likes. 
							
						 
						
							2020-04-24 13:48:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								850377a7b8 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/1629-fav-race-condition' into 'develop'  
							
							... 
							
							
							
							SideEffects: Run in transaction.
Closes  #1629 
See merge request pleroma/pleroma!2417  
							
						 
						
							2020-04-22 19:26:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1bcbdc7a9f 
								
							 
						 
						
							
							
								
								SideEffects: Use less cryptic syntax.  
							
							
							
						 
						
							2020-04-22 21:21:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e62173dfc8 
								
							 
						 
						
							
							
								
								SideEffects: Run in transaction.  
							
							... 
							
							
							
							This fixes race conditions. 
							
						 
						
							2020-04-22 18:40:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5102468d0f 
								
							 
						 
						
							
							
								
								Polls: Persist and show voters' count  
							
							
							
						 
						
							2020-04-22 14:06:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bedc558809 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into accept-deletes  
							
							
							
						 
						
							2020-04-20 10:15:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b54c8813d6 
								
							 
						 
						
							
							
								
								Add :reject_deletes option to SimplePolicy  
							
							
							
						 
						
							2020-04-20 10:11:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
						 
						
							2020-04-20 12:59:16 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								79445ae5d2 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'  
							
							... 
							
							
							
							migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes  #1697 
See merge request pleroma/pleroma!2403  
							
						 
						
							2020-04-18 06:59:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								24f760c2f7 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex  
							
							
							
						 
						
							2020-04-17 22:48:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eb61564005 
								
							 
						 
						
							
							
								
								migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo  
							
							
							
						 
						
							2020-04-17 23:57:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e0d7847bc5 
								
							 
						 
						
							
							
								
								Merge branch 'sideeffects-test' into 'develop'  
							
							... 
							
							
							
							SideEffects: Test for notification creation.
See merge request pleroma/pleroma!2399  
							
						 
						
							2020-04-17 14:03:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								26d9c83316 
								
							 
						 
						
							
							
								
								SideEffects: Test for notification creation.  
							
							
							
						 
						
							2020-04-17 15:50:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46f051048f 
								
							 
						 
						
							
							
								
								migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering  
							
							
							
						 
						
							2020-04-17 14:32:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a3c74b244 
								
							 
						 
						
							
							
								
								Always accept deletions through SimplePolicy  
							
							
							
						 
						
							2020-04-12 20:26:35 -05: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