lain 
								
							 
						 
						
							
							
							
							
								
							
							
								98af7b59e4 
								
							 
						 
						
							
							
								
								Merge branch 'update-validator' into 'develop'  
							
							... 
							
							
							
							Update validator
See merge request pleroma/pleroma!2668  
							
						 
						
							2020-06-23 18:10:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c7d69e9256 
								
							 
						 
						
							
							
								
								Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'  
							
							... 
							
							
							
							Moving mrf settings from instance to separate mrf group
Closes  #1631 
See merge request pleroma/pleroma!2320  
							
						 
						
							2020-06-23 16:38:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								aee815b478 
								
							 
						 
						
							
							
								
								ObjectValidator: Clarify type of object.  
							
							
							
						 
						
							2020-06-23 12:37:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2c603f2009 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator  
							
							
							
						 
						
							2020-06-23 10:17:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c116b6d6d6 
								
							 
						 
						
							
							
								
								ActivityPubController: Update upload_media @doc  
							
							... 
							
							
							
							Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810  
							
						 
						
							2020-06-23 04:42:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e785cd5cae 
								
							 
						 
						
							
							
								
								ActivityPub: Remove update and switch to pipeline.  
							
							
							
						 
						
							2020-06-22 13:59:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c75ba63bef 
								
							 
						 
						
							
							
								
								Merge branch '1865-media-only' into 'develop'  
							
							... 
							
							
							
							Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"
Closes  #1865 
See merge request pleroma/pleroma!2650  
							
						 
						
							2020-06-22 11:34:07 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9438f83f83 
								
							 
						 
						
							
							
								
								Transmogrifier: Handle Update with the pipeline.  
							
							
							
						 
						
							2020-06-22 13:16:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								31a4d42ce0 
								
							 
						 
						
							
							
								
								SideEffects: Handle user updating.  
							
							
							
						 
						
							2020-06-22 13:15:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								35e9282ffd 
								
							 
						 
						
							
							
								
								HellthreadPolicy: Restrict to Notes and Articles.  
							
							
							
						 
						
							2020-06-22 10:35:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7d542450b1 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into '1865-media-only'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2020-06-20 09:33:18 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d4cfc9c5f 
								
							 
						 
						
							
							
								
								Stop filling conversation field on incoming objects (legacy, unused)  
							
							... 
							
							
							
							conversation field is still set for outgoing federation for compatibility. 
							
						 
						
							2020-06-20 00:08:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								75670a99e4 
								
							 
						 
						
							
							
								
								UpdateValidator: Only allow updates from the user themselves.  
							
							
							
						 
						
							2020-06-19 16:38:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								abdb540d45 
								
							 
						 
						
							
							
								
								ObjectValidators: Add basic UpdateValidator.  
							
							
							
						 
						
							2020-06-19 15:30:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d772361e62 
								
							 
						 
						
							
							
								
								Merge branch 'fix/1787-mogrify-args' into 'develop'  
							
							... 
							
							
							
							Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652  
							
						 
						
							2020-06-17 15:53:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a77b0388f4 
								
							 
						 
						
							
							
								
								credo fix  
							
							
							
						 
						
							2020-06-17 10:31:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed189568f3 
								
							 
						 
						
							
							
								
								moving mrf settings from instance to separate group  
							
							
							
						 
						
							2020-06-16 18:32:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c2cee33ad 
								
							 
						 
						
							
							
								
								moving custom ecto types in context folders  
							
							
							
						 
						
							2020-06-16 17:50:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1eb6cedaad 
								
							 
						 
						
							
							
								
								ActivityPub: When restricting to media posts, only show 'Creates'.  
							
							
							
						 
						
							2020-06-16 13:08:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b7df7436c8 
								
							 
						 
						
							
							
								
								Conversations: Return last dm for conversation, not last message.  
							
							
							
						 
						
							2020-06-15 12:27:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								271ea5068f 
								
							 
						 
						
							
							
								
								Merge branch '1851-favorites-pagination' into 'develop'  
							
							... 
							
							
							
							StatusController: Correctly paginate favorites.
Closes  #1851 
See merge request pleroma/pleroma!2636  
							
						 
						
							2020-06-13 17:20:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								cb7be6eef2 
								
							 
						 
						
							
							
								
								Remove use of atoms in MRF.UserAllowListPolicy  
							
							
							
						 
						
							2020-06-13 12:08:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								4115701f71 
								
							 
						 
						
							
							
								
								Merge branch 'recipients-experiments' into 'develop'  
							
							... 
							
							
							
							ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637  
							
						 
						
							2020-06-12 16:57:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e557265a03 
								
							 
						 
						
							
							
								
								Merge branch 'global-status-expiration' into 'develop'  
							
							... 
							
							
							
							Global status expiration
See merge request pleroma/pleroma!2208  
							
						 
						
							2020-06-12 14:14:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9e411372d0 
								
							 
						 
						
							
							
								
								ActivityPub: Don't show announces of your own objects in timeline.  
							
							
							
						 
						
							2020-06-10 12:10:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								063e6b9841 
								
							 
						 
						
							
							
								
								StatusController: Correctly paginate favorites.  
							
							... 
							
							
							
							Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this. 
							
						 
						
							2020-06-09 10:53:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								064c4f86f3 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-09 09:36:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe1cb56fdc 
								
							 
						 
						
							
							
								
								transmogrifier: MIME.valid?/1 for mediaType  
							
							... 
							
							
							
							No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429 
is merged. 
							
						 
						
							2020-06-08 21:04:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d44843e677 
								
							 
						 
						
							
							
								
								Restrict ActivityExpirationPolicy to Notes only  
							
							
							
						 
						
							2020-06-08 17:56:34 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								da22119c2f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into global-status-expiration  
							
							
							
						 
						
							2020-06-08 17:21:47 +04: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 
								
							 
						 
						
							
							
							
							
								
							
							
								7d66dd180a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms  
							
							
							
						 
						
							2020-06-08 10:18:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2cdaac4330 
								
							 
						 
						
							
							
								
								SideEffects: Move streaming of chats to after the transaction.  
							
							
							
						 
						
							2020-06-07 14:52:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0365053c8d 
								
							 
						 
						
							
							
								
								AttachmentValidator: Check if the mime type is valid.  
							
							
							
						 
						
							2020-06-07 09:19:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ca0e6e702b 
								
							 
						 
						
							
							
								
								ChatMessageReference -> Chat.MessageReference  
							
							
							
						 
						
							2020-06-06 11:51:10 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								317e2b8d61 
								
							 
						 
						
							
							
								
								Use atoms as keys in ActivityPub.fetch_* functions options  
							
							
							
						 
						
							2020-06-04 21:36:26 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								56dfa0e0fb 
								
							 
						 
						
							
							
								
								Transmogrifier: Update notification after accepting.  
							
							
							
						 
						
							2020-06-04 19:22:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								00748e9650 
								
							 
						 
						
							
							
								
								ChatMessageReferences: Change seen -> unread  
							
							
							
						 
						
							2020-06-04 17:14:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c16315d055 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for AdminAPI.ReportController  
							
							
							
						 
						
							2020-06-03 19:17:05 +04:00