lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c450b248cc 
								
							 
						 
						
							
							
								
								Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'  
							
							... 
							
							
							
							Delete outgoing pending follow requests on user deletion
See merge request pleroma/pleroma!2631  
							
						 
						
							2020-06-08 10:54:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								3b5282bef2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-08 11:19:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a1aa9fa913 
								
							 
						 
						
							
							
								
								Merge branch 'activity-pub-use-atoms-as-keys' into 'develop'  
							
							... 
							
							
							
							Use atoms as keys in `ActivityPub.fetch_*` options
See merge request pleroma/pleroma!2629  
							
						 
						
							2020-06-08 09:11:55 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								89b85f6529 
								
							 
						 
						
							
							
								
								ChatController: Remove nonsensical pagination.  
							
							
							
						 
						
							2020-06-08 11:09:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7d66dd180a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-08 10:18:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1a2acce7c5 
								
							 
						 
						
							
							
								
								Docs: Document new mandatory parameter.  
							
							
							
						 
						
							2020-06-07 20:23:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fe2a5d0614 
								
							 
						 
						
							
							
								
								ChatController: Make last_read_id mandatory.  
							
							
							
						 
						
							2020-06-07 20:22:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d9e586887 
								
							 
						 
						
							
							
								
								Delete pending follow requests on user deletion  
							
							
							
						 
						
							2020-06-07 17:31:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								680fa5fa36 
								
							 
						 
						
							
							
								
								Docs: Update docs on mark as read.  
							
							
							
						 
						
							2020-06-07 15:41:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								801e668a97 
								
							 
						 
						
							
							
								
								ChatController: Add last_read_id option to mark_as_read.  
							
							
							
						 
						
							2020-06-07 15:38:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2cdaac4330 
								
							 
						 
						
							
							
								
								SideEffects: Move streaming of chats to after the transaction.  
							
							
							
						 
						
							2020-06-07 14:52:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1a11f0e453 
								
							 
						 
						
							
							
								
								Chats: Change id to flake id.  
							
							
							
						 
						
							2020-06-07 14:25:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0365053c8d 
								
							 
						 
						
							
							
								
								AttachmentValidator: Check if the mime type is valid.  
							
							
							
						 
						
							2020-06-07 09:19:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								40fc4e974e 
								
							 
						 
						
							
							
								
								Notfication: Add validation of notification types  
							
							
							
						 
						
							2020-06-06 16:59:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f4cf4ae16e 
								
							 
						 
						
							
							
								
								ChatController: Use new oauth scope *:chats.  
							
							
							
						 
						
							2020-06-06 16:48:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1b07402ab 
								
							 
						 
						
							
							
								
								User: Add raw_bio, storing unformatted bio  
							
							... 
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1643  
							
						 
						
							2020-06-06 16:23:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f77d4a302d 
								
							 
						 
						
							
							
								
								Credo fixes.  
							
							
							
						 
						
							2020-06-06 15:51:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9189b489ee 
								
							 
						 
						
							
							
								
								Migrations: Move Notification migration code to helper  
							
							
							
						 
						
							2020-06-06 15:33:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9fa3f0b156 
								
							 
						 
						
							
							
								
								Notification: Change type of type to an enum.  
							
							
							
						 
						
							2020-06-06 13:08:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ca0e6e702b 
								
							 
						 
						
							
							
								
								ChatMessageReference -> Chat.MessageReference  
							
							
							
						 
						
							2020-06-06 11:51:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								137adef6e0 
								
							 
						 
						
							
							
								
								ChatMessageReference: Use FlakeId.Ecto.Type  
							
							... 
							
							
							
							No need for compat because this is brand new. 
							
						 
						
							2020-06-06 10:42:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								239d03499e 
								
							 
						 
						
							
							
								
								Chat: creation_cng -> changeset  
							
							... 
							
							
							
							Make our usage of this more uniform. 
							
						 
						
							2020-06-06 10:38:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c5e3f2454c 
								
							 
						 
						
							
							
								
								Docs: Unify parameters in examples.  
							
							
							
						 
						
							2020-06-06 10:35:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4e8c0eecd5 
								
							 
						 
						
							
							
								
								WebPush: Don't break on contentless chat messages.  
							
							
							
						 
						
							2020-06-06 09:46:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								167812a3f2 
								
							 
						 
						
							
							
								
								Fix pagination  
							
							
							
						 
						
							2020-06-05 23:18:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b02df1803e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys  
							
							
							
						 
						
							2020-06-05 23:15:10 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f24d2f714f 
								
							 
						 
						
							
							
								
								Credo fixes  
							
							
							
						 
						
							2020-06-05 17:18:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a8ca030d85 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-05 16:53:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								d74985af23 
								
							 
						 
						
							
							
								
								Merge branch 'features/apc2s-pagination' into 'develop'  
							
							... 
							
							
							
							Fix AP C2S pagination
Closes  #866  and #751 
See merge request pleroma/pleroma!2491  
							
						 
						
							2020-06-05 14:52:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								657e1583f8 
								
							 
						 
						
							
							
								
								Merge branch 'features/put_if_present' into 'develop'  
							
							... 
							
							
							
							Create Pleroma.Maps.put_if_present(map, key, value, value_function // &{:ok, &1}) :: map
See merge request pleroma/pleroma!2436  
							
						 
						
							2020-06-05 14:48:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								54bae06b4f 
								
							 
						 
						
							
							
								
								Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})  
							
							... 
							
							
							
							Unifies all the similar functions to one and simplify some blocks with it. 
							
						 
						
							2020-06-05 14:48:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								115d08a754 
								
							 
						 
						
							
							
								
								Pipeline: Add a side effects step after the transaction finishes  
							
							... 
							
							
							
							This is to run things like streaming notifications out, which will
sometimes need data that is created by the transaction, but is
streamed out asynchronously. 
							
						 
						
							2020-06-05 16:47:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								65689ba9bd 
								
							 
						 
						
							
							
								
								If Credo fixes is so good, why is there no Credo fixes 2?  
							
							
							
						 
						
							2020-06-05 13:10:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f3ea6ee2c8 
								
							 
						 
						
							
							
								
								Credo fixes.  
							
							
							
						 
						
							2020-06-05 12:45:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0efa8aa0b9 
								
							 
						 
						
							
							
								
								Transmogrifier: For follows, create notifications last.  
							
							... 
							
							
							
							As the notification type changes depending on the follow state,
the notification should not be created and streamed out before the
state settles. For this reason, the notification creation has been
delayed until it's clear if the user has been followed or not.
This is a bit hacky but it will be properly rewritten using the
pipeline soon. 
							
						 
						
							2020-06-05 12:26:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								cc8a7dc205 
								
							 
						 
						
							
							
								
								SideEffects / ChatView: Add an unread cache.  
							
							... 
							
							
							
							This is to prevent wrong values in the stream. 
							
						 
						
							2020-06-05 12:01:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aa2ac76510 
								
							 
						 
						
							
							
								
								Notification: Don't break on figuring out the type of old EmojiReactions  
							
							
							
						 
						
							2020-06-04 20:40:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d44da91bbf 
								
							 
						 
						
							
							
								
								SubscriptionOperation: Let chat mentions through.  
							
							
							
						 
						
							2020-06-04 20:28:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								317e2b8d61 
								
							 
						 
						
							
							
								
								Use atoms as keys in ActivityPub.fetch_* functions options  
							
							
							
						 
						
							2020-06-04 21:36:26 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								74edd4f391 
								
							 
						 
						
							
							
								
								Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-04 19:24:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								56dfa0e0fb 
								
							 
						 
						
							
							
								
								Transmogrifier: Update notification after accepting.  
							
							
							
						 
						
							2020-06-04 19:22:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9a53f619e0 
								
							 
						 
						
							
							
								
								Apply suggestion to test/chat_message_reference_test.exs  
							
							
							
						 
						
							2020-06-04 15:16:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								41503b1673 
								
							 
						 
						
							
							
								
								Apply suggestion to test/web/activity_pub/transmogrifier/chat_message_test.exs  
							
							
							
						 
						
							2020-06-04 15:16:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								00748e9650 
								
							 
						 
						
							
							
								
								ChatMessageReferences: Change seen -> unread  
							
							
							
						 
						
							2020-06-04 17:14:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								a42d135cce 
								
							 
						 
						
							
							
								
								test fix  
							
							
							
						 
						
							2020-06-04 10:51:24 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								b57e4ad1ab 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'openapi/admin/relay'  
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/web/admin_api/controllers/admin_api_controller.ex 
							
						 
						
							2020-06-04 13:29:32 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f5cb1f3616 
								
							 
						 
						
							
							
								
								Merge branch 'openapi/admin/config' into 'develop'  
							
							... 
							
							
							
							Add OpenAPI spec to AdminAPI.ConfigController
See merge request pleroma/pleroma!2606  
							
						 
						
							2020-06-04 13:00:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6e103a18af 
								
							 
						 
						
							
							
								
								Docs: Document WebPush changes.  
							
							
							
						 
						
							2020-06-04 14:49:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b952f3f379 
								
							 
						 
						
							
							
								
								WebPush: Push out chat message notications.  
							
							
							
						 
						
							2020-06-04 14:49:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5d7dda883e 
								
							 
						 
						
							
							
								
								SideEffectsTest: More tests.  
							
							
							
						 
						
							2020-06-04 14:46:41 +02:00