Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fcea6a9d2c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/fast_sanitize  
							
							 
							
							
							
						 
						
							2019-10-30 17:51:15 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kPherox 
								
							 
						 
						
							
							
							
							
								
							
							
								c2f2d7bcf6 
								
							 
						 
						
							
							
								
								Add test follow activity for locked account  
							
							 
							
							
							
						 
						
							2019-10-29 18:46:22 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								08f6837065 
								
							 
						 
						
							
							
								
								Switch from HtmlSanitizeEx to FastSanitize  
							
							 
							
							
							
						 
						
							2019-10-29 01:18:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2480200759 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/following-relationships' into 'develop'  
							
							 
							
							... 
							
							
							
							Move following relationships to a separate table
Closes  #1233 
See merge request pleroma/pleroma!1814  
							
						 
						
							2019-10-28 07:27:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								5329b361ec 
								
							 
						 
						
							
							
								
								fix test  
							
							 
							
							
							
						 
						
							2019-10-24 12:48:17 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4c1dd55c48 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships  
							
							 
							
							
							
						 
						
							2019-10-24 14:55:36 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8cc809e44e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/notification.ex 
							
						 
						
							2019-10-23 17:22:42 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								3f6a596922 
								
							 
						 
						
							
							
								
								activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors  
							
							 
							
							
							
						 
						
							2019-10-22 20:50:46 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								277aea45b9 
								
							 
						 
						
							
							
								
								tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization  
							
							 
							
							... 
							
							
							
							There appears to be confusion on whether or not Pleroma can handle this particular
sin of JSON-LD.  It can, and we will add regression tests to prove that it can handle
this particular sin.  Which, by the way, this is actually not a "feature" of JSON-LD,
but whatever. 
							
						 
						
							2019-10-22 19:43:31 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7c7f90bc4f 
								
							 
						 
						
							
							
								
								[ #1304 ] Merged develop, handled User.Info.invisible.  
							
							 
							
							
							
						 
						
							2019-10-21 11:58:22 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a11a7176d5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex 
							
						 
						
							2019-10-21 11:05:09 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4ea1a61b00 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into refactor/following-relationships  
							
							 
							
							
							
						 
						
							2019-10-21 14:19:15 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c6fdfbc4f1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs 
							
						 
						
							2019-10-20 20:43:18 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								ba92522c69 
								
							 
						 
						
							
							
								
								tests: add test to ensure invisible actors are rendered with the invisible hint set to true  
							
							 
							
							
							
						 
						
							2019-10-19 23:21:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								52d56ed705 
								
							 
						 
						
							
							
								
								tests: add test verifying the relay user is invisible  
							
							 
							
							
							
						 
						
							2019-10-19 23:21:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								80d3912a56 
								
							 
						 
						
							
							
								
								test: activitypub: use User.invisible?/1 for testing invisibility  
							
							 
							
							
							
						 
						
							2019-10-19 23:21:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								ef659331b0 
								
							 
						 
						
							
							
								
								implement invisible support for remote users  
							
							 
							
							
							
						 
						
							2019-10-19 23:21:37 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								dbfdb1f6e3 
								
							 
						 
						
							
							
								
								add some missing tesla fixtures  
							
							 
							
							
							
						 
						
							2019-10-18 14:50:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								700c654208 
								
							 
						 
						
							
							
								
								tests: fix relay tests  
							
							 
							
							
							
						 
						
							2019-10-18 14:50:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								d379b48769 
								
							 
						 
						
							
							
								
								kill almost all of the OStatus module  
							
							 
							
							
							
						 
						
							2019-10-18 14:50:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								4f82e42e4e 
								
							 
						 
						
							
							
								
								websub: remove entirely  
							
							 
							
							
							
						 
						
							2019-10-18 14:50:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								359dd1890e 
								
							 
						 
						
							
							
								
								Mastodon API: Mark the conversation as read for the author when they send a new direct message  
							
							 
							
							
							
						 
						
							2019-10-17 16:49:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								10ff01acd9 
								
							 
						 
						
							
							
								
								[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.  
							
							 
							
							
							
						 
						
							2019-10-16 21:59:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								a97b642289 
								
							 
						 
						
							
							
								
								Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints  
							
							 
							
							
							
						 
						
							2019-10-14 02:57:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								37812740c4 
								
							 
						 
						
							
							
								
								Transmogrifier: Correctly save incoming ids for Accept/Reject.  
							
							 
							
							
							
						 
						
							2019-10-11 11:48:58 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9b963064eb 
								
							 
						 
						
							
							
								
								Transmogrifier: Actually store who deleted a note.  
							
							 
							
							
							
						 
						
							2019-10-11 11:25:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								059005ff82 
								
							 
						 
						
							
							
								
								Replace user.following with Pleroma.FollowingRelationship  
							
							 
							
							
							
						 
						
							2019-10-11 02:35:32 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								29647dfd09 
								
							 
						 
						
							
							
								
								Transmogrifier: Save correct ids for incoming deletes.  
							
							 
							
							
							
						 
						
							2019-10-10 17:17:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								58aeabd020 
								
							 
						 
						
							
							
								
								mrf/simple_policy: check actor against accept/reject  
							
							 
							
							
							
						 
						
							2019-10-07 03:49:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								45b7f03f89 
								
							 
						 
						
							
							
								
								Merge branch 'accept-embedded-announce-object' into 'develop'  
							
							 
							
							... 
							
							
							
							Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770  
							
						 
						
							2019-10-05 19:28:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4b8524f392 
								
							 
						 
						
							
							
								
								ActivityPub / Transmogrifier: Correctly store incoming Update id.  
							
							 
							
							
							
						 
						
							2019-10-05 14:49:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b1ff66dc5f 
								
							 
						 
						
							
							
								
								Add test for handling Announces with inlined object from different origin  
							
							 
							
							
							
						 
						
							2019-10-05 13:56:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								977e711e22 
								
							 
						 
						
							
							
								
								Import object from self-Announce whenever possible  
							
							 
							
							
							
						 
						
							2019-10-05 13:56:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								83631752af 
								
							 
						 
						
							
							
								
								removed legacy api: "/objects/:uuid/likes"  
							
							 
							
							
							
						 
						
							2019-10-04 22:35:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2a7f44acfe 
								
							 
						 
						
							
							
								
								ActivityPub.Utils: Fix undo test.  
							
							 
							
							
							
						 
						
							2019-10-04 17:10:49 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								568a995d64 
								
							 
						 
						
							
							
								
								ActivityPub: Change addressing of Undo.  
							
							 
							
							
							
						 
						
							2019-10-04 16:32:42 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1c6e1055c8 
								
							 
						 
						
							
							
								
								Add CustomEmojiController  
							
							 
							
							
							
						 
						
							2019-10-02 19:16:34 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								86880b9821 
								
							 
						 
						
							
							
								
								Inline object when Announcing a self-owned private object  
							
							 
							
							
							
						 
						
							2019-10-02 12:15:06 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e0b654e202 
								
							 
						 
						
							
							
								
								Add tests  
							
							 
							
							
							
						 
						
							2019-10-01 18:38:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								dae744478e 
								
							 
						 
						
							
							
								
								Transmogrifier: Handle compact objects in undos.  
							
							 
							
							
							
						 
						
							2019-09-30 18:13:05 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c55facf78b 
								
							 
						 
						
							
							
								
								Fix warning in TransmogrifierTest  
							
							 
							
							
							
						 
						
							2019-09-30 19:10:56 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								26f66fb70a 
								
							 
						 
						
							
							
								
								Merge branch 'features/apc2s-media-upload' into 'develop'  
							
							 
							
							... 
							
							
							
							AP C2S mediaUpload
Closes  #1171 
See merge request pleroma/pleroma!1706  
							
						 
						
							2019-09-30 11:21:49 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								71eff09e56 
								
							 
						 
						
							
							
								
								common api: make sure the generated IR is actually federatable  
							
							 
							
							
							
						 
						
							2019-09-30 10:39:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								e7309d3b60 
								
							 
						 
						
							
							
								
								test: transmogrifier: add test proving that transmogrifier can handle outgoing listens  
							
							 
							
							
							
						 
						
							2019-09-30 10:39:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								172c74a77b 
								
							 
						 
						
							
							
								
								activitypub: transmogrifier: implement support for Listen activities  
							
							 
							
							
							
						 
						
							2019-09-30 10:39:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								1f9de2a8cd 
								
							 
						 
						
							
							
								
								activitypub: implement IR-level considerations for Listen activities  
							
							 
							
							
							
						 
						
							2019-09-30 10:39:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								beabc49e35 
								
							 
						 
						
							
							
								
								Merge branch 'feature/activities-pagination-by-offset' into 'develop'  
							
							 
							
							... 
							
							
							
							Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714  
							
						 
						
							2019-09-26 02:49:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d87be2ec96 
								
							 
						 
						
							
							
								
								Don't embed the first page in inboxes/outboxes and refactor the views to  
							
							 
							
							... 
							
							
							
							follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased. 
							
						 
						
							2019-09-25 15:59:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								60cbea5bb2 
								
							 
						 
						
							
							
								
								Allow activities pagination via limit/offset  
							
							 
							
							
							
						 
						
							2019-09-25 01:25:42 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0dc8f3d6d2 
								
							 
						 
						
							
							
								
								/api/ap/uploadMedia → /api/ap/upload_media  
							
							 
							
							
							
						 
						
							2019-09-24 19:03:06 +02:00