Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								269d592181 
								
							 
						 
						
							
							
								
								[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).  
							
							 
							
							
							
						 
						
							2020-02-15 20:41:38 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b95dd5e217 
								
							 
						 
						
							
							
								
								[ #1505 ] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message.  
							
							 
							
							
							
						 
						
							2020-02-10 11:46:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								24e49d14f2 
								
							 
						 
						
							
							
								
								[ #1505 ] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests.  
							
							 
							
							
							
						 
						
							2020-02-09 17:34:48 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7c3991f59e 
								
							 
						 
						
							
							
								
								[ #1505 ] Fixed replies serialization (included objects' ids instead of activities' ids).  
							
							 
							
							
							
						 
						
							2020-02-09 10:17:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4e6bbdc7b5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							 
							
							
							
						 
						
							2020-02-08 19:59:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d458f4fdca 
								
							 
						 
						
							
							
								
								[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.  
							
							 
							
							
							
						 
						
							2020-02-08 19:58:02 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								8a79f20c21 
								
							 
						 
						
							
							
								
								EmojiReactions: Rename to EmojiReacts  
							
							 
							
							
							
						 
						
							2020-02-06 18:09:57 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e84fee5b86 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation  
							
							 
							
							
							
						 
						
							2020-02-05 07:56:36 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a0d9d42eaa 
								
							 
						 
						
							
							
								
								Emoji Reactions: Actually use the validation.  
							
							 
							
							
							
						 
						
							2020-01-30 16:07:37 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								86e4d23acb 
								
							 
						 
						
							
							
								
								[ #1505 ] Background fetching of incoming activities' replies collections.  
							
							 
							
							
							
						 
						
							2020-01-25 10:47:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								cf96c40057 
								
							 
						 
						
							
							
								
								[ #1505 ] Added Mastodon-compatible replies collection to Note federated representation.  
							
							 
							
							
							
						 
						
							2020-01-22 21:10:17 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								7722e5a67a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/move-activity' into 'develop'  
							
							 
							
							... 
							
							
							
							Support "Move" activity
Closes  #1316 
See merge request pleroma/pleroma!1883  
							
						 
						
							2019-12-02 16:26:19 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c4b468a95b 
								
							 
						 
						
							
							
								
								Cleanup tests output  
							
							 
							
							
							
						 
						
							2019-11-28 16:44:48 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3c0abfca53 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/move-activity  
							
							 
							
							
							
						 
						
							2019-11-14 16:39:45 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b22ee9d966 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into reactions  
							
							 
							
							
							
						 
						
							2019-11-08 13:27:11 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a304a2a845 
								
							 
						 
						
							
							
								
								Merge branch 'transmogrifier-test-errors' into 'develop'  
							
							 
							
							... 
							
							
							
							capture test log where errors are expected
See merge request pleroma/pleroma!1915  
							
						 
						
							2019-11-04 15:19:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								556da92902 
								
							 
						 
						
							
							
								
								Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'  
							
							 
							
							... 
							
							
							
							Store status data inside flag activity
See merge request pleroma/pleroma!1849  
							
						 
						
							2019-11-04 14:11:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								61fc739ab8 
								
							 
						 
						
							
							
								
								Handle "Move" activity  
							
							 
							
							
							
						 
						
							2019-10-30 18:21:49 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kPherox 
								
							 
						 
						
							
							
							
							
								
							
							
								c2f2d7bcf6 
								
							 
						 
						
							
							
								
								Add test follow activity for locked account  
							
							 
							
							
							
						 
						
							2019-10-29 18:46:22 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								56e42602b0 
								
							 
						 
						
							
							
								
								capture where errors are expected  
							
							 
							
							
							
						 
						
							2019-10-28 12:51:58 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4270861085 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/move-activity  
							
							 
							
							
							
						 
						
							2019-10-28 15:10:47 +07: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								8282b6ac3d 
								
							 
						 
						
							
							
								
								Make sure incoming flags are updated with status data  
							
							 
							
							
							
						 
						
							2019-10-27 16:17:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								791bcfd90f 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/store-statuses-data-inside-flag  
							
							 
							
							
							
						 
						
							2019-10-27 16:11:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b777083f3f 
								
							 
						 
						
							
							
								
								Add also_known_as field to Pleroma.User  
							
							 
							
							
							
						 
						
							2019-10-25 19:14:18 +07: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								b08b1d5d91 
								
							 
						 
						
							
							
								
								Store status data inside Flag activity  
							
							 
							
							
							
						 
						
							2019-10-23 21:27:22 +02: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								dbfdb1f6e3 
								
							 
						 
						
							
							
								
								add some missing tesla fixtures  
							
							 
							
							
							
						 
						
							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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								91e90aa807 
								
							 
						 
						
							
							
								
								Merge branch 'misskey-compat' into 'reactions'  
							
							 
							
							... 
							
							
							
							Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783  
							
						 
						
							2019-10-07 07:25:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								61097ba6ab 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'reactions'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2019-10-06 08:11:47 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								6a85f7d1ea 
								
							 
						 
						
							
							
								
								Transmogrifier: Extend misskey like compatibility.  
							
							 
							
							
							
						 
						
							2019-10-05 10:45:42 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								43a211bcb1 
								
							 
						 
						
							
							
								
								Transmogrifier: Handle misskey likes with reactions like EmojiReactions.  
							
							 
							
							
							
						 
						
							2019-10-04 17:01:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c9043c6c80 
								
							 
						 
						
							
							
								
								Transmogrifier: Handle incoming Undos for EmojiReactions.  
							
							 
							
							
							
						 
						
							2019-10-03 18:37:23 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1c6e1055c8 
								
							 
						 
						
							
							
								
								Add CustomEmojiController  
							
							 
							
							
							
						 
						
							2019-10-02 19:16:34 +07:00