rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c7d8ccd0c4 
								
							 
						 
						
							
							
								
								Remove useless with clause  
							
							
							
						 
						
							2019-09-25 16:26:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1ddd403339 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							
							
						 
						
							2019-09-25 13:20:48 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								760df67a7b 
								
							 
						 
						
							
							
								
								Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'  
							
							... 
							
							
							
							Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes  #1223 
See merge request pleroma/pleroma!1703  
							
						 
						
							2019-09-23 22:35:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								ad9595ca55 
								
							 
						 
						
							
							
								
								Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'  
							
							... 
							
							
							
							added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651  
							
						 
						
							2019-09-23 22:34:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								e1d2d69c87 
								
							 
						 
						
							
							
								
								Clean up views  
							
							
							
						 
						
							2019-09-23 22:33:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								38245f1336 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2019-09-23 21:32:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7cf1252455 
								
							 
						 
						
							
							
								
								Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public)  
							
							
							
						 
						
							2019-09-20 18:27:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									D Anzorge 
								
							 
						 
						
							
							
							
							
								
							
							
								0e6085da10 
								
							 
						 
						
							
							
								
								Fix pagination in AP outbox.json  
							
							
							
						 
						
							2019-09-19 16:09:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d4ed3a35b8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2019-09-19 07:35:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								f95a2b2cda 
								
							 
						 
						
							
							
								
								Merge branch 'issue/733' into 'develop'  
							
							... 
							
							
							
							[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657  
							
						 
						
							2019-09-18 22:28:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								ab2ca3038f 
								
							 
						 
						
							
							
								
								Merge branch 'hide-follower-following-count' into 'develop'  
							
							... 
							
							
							
							Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663  
							
						 
						
							2019-09-18 21:13:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d32894ae51 
								
							 
						 
						
							
							
								
								Move object internal fields to a constant  
							
							
							
						 
						
							2019-09-18 19:24:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								7dd51652f9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/733  
							
							
							
						 
						
							2019-09-17 21:20:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								2301de3d75 
								
							 
						 
						
							
							
								
								Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'  
							
							... 
							
							
							
							Fix `Transmogrifier.upgrade_user_from_ap_id/1`
See merge request pleroma/pleroma!1677  
							
						 
						
							2019-09-17 17:16:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								95a4a19417 
								
							 
						 
						
							
							
								
								Merge branch 'support/tests' into 'develop'  
							
							... 
							
							
							
							add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627  
							
						 
						
							2019-09-17 14:47:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								450bf7a63c 
								
							 
						 
						
							
							
								
								Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)  
							
							
							
						 
						
							2019-09-17 14:45:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								085d014f08 
								
							 
						 
						
							
							
								
								Fix Transmogrifier.upgrade_user_from_ap_id/1  
							
							
							
						 
						
							2019-09-16 19:26:00 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								96816ceaa2 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-4fabf83a' into 'develop'"  
							
							... 
							
							
							
							This reverts commit fe7fd331264fabf83ad0 
							
						 
						
							2019-09-16 17:55:04 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c623b4324d 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'streamer-refactoring' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1653  
							
						 
						
							2019-09-16 09:09:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								aab264db82 
								
							 
						 
						
							
							
								
								Streamer refactoring  
							
							
							
						 
						
							2019-09-16 07:44:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								17142a3720 
								
							 
						 
						
							
							
								
								Merge branch 'feature/delivery-tracking' into 'develop'  
							
							... 
							
							
							
							Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661  
							
						 
						
							2019-09-16 07:39:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d75bc728e7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/733  
							
							
							
						 
						
							2019-09-16 07:34:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								8751809e1e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into support/tests  
							
							
							
						 
						
							2019-09-15 14:22:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6bcedb693c 
								
							 
						 
						
							
							
								
								[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							... 
							
							
							
							# Conflicts:
#	docs/config.md
#	mix.lock 
							
						 
						
							2019-09-14 16:11:44 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ba70a8cae6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/delivery-tracking  
							
							
							
						 
						
							2019-09-13 19:42:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8900cb68ae 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							
							
						 
						
							2019-09-13 15:25:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2784962dba 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							
							
						 
						
							2019-09-13 15:23:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3896a51b8a 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							
							
						 
						
							2019-09-13 10:09:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5170170483 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex  
							
							
							
						 
						
							2019-09-13 10:09:46 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								fb96facc32 
								
							 
						 
						
							
							
								
								Remove unused functions and fix credo issues  
							
							
							
						 
						
							2019-09-13 12:29:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ce23529d91 
								
							 
						 
						
							
							
								
								Use delivery info when federating deletes  
							
							
							
						 
						
							2019-09-13 11:38:17 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								39dc9b470c 
								
							 
						 
						
							
							
								
								Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils  
							
							
							
						 
						
							2019-09-13 12:44:59 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2b40e57a72 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2019-09-13 06:55:05 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								769fb778d4 
								
							 
						 
						
							
							
								
								Track object/create activity fetches  
							
							
							
						 
						
							2019-09-12 21:37:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f548cb2b7 
								
							 
						 
						
							
							
								
								added test for Ostatus  
							
							
							
						 
						
							2019-09-12 10:25:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								74e4c72c4a 
								
							 
						 
						
							
							
								
								Fix double quotes in error logs  
							
							... 
							
							
							
							Example:
pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca "", error: nil 
							
						 
						
							2019-09-11 16:16:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								007e0c1ce1 
								
							 
						 
						
							
							
								
								added tests  
							
							
							
						 
						
							2019-09-11 23:19:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								fcf604fa43 
								
							 
						 
						
							
							
								
								added tests  
							
							
							
						 
						
							2019-09-11 07:23:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a31af93e1d 
								
							 
						 
						
							
							
								
								added tests /activity_pub/transmogrifier.ex  
							
							
							
						 
						
							2019-09-10 16:43:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								11e12b5761 
								
							 
						 
						
							
							
								
								Add Pleroma.Plugs.Cache  
							
							
							
						 
						
							2019-09-09 18:53:08 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								edbaf78176 
								
							 
						 
						
							
							
								
								Merge branch 'fix/read-inbox' into 'develop'  
							
							... 
							
							
							
							Fix `ActivityPubController.read_inbox/2`
Closes  #1248 
See merge request pleroma/pleroma!1649  
							
						 
						
							2019-09-09 18:21:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e0f84d0043 
								
							 
						 
						
							
							
								
								Fix ActivityPubController.read_inbox/2  
							
							
							
						 
						
							2019-09-10 01:11:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								c3f00447af 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							
							
						 
						
							2019-09-08 08:41:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								39f99dc6cd 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into support/tests  
							
							
							
						 
						
							2019-09-07 22:13:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								5effb2cbca 
								
							 
						 
						
							
							
								
								activitypub: help ecto build a better query for thread mute filtering  
							
							... 
							
							
							
							using an indexed value in thread_mute table helps ecto build a better query. 
							
						 
						
							2019-09-06 23:11:26 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ae506ca997 
								
							 
						 
						
							
							
								
								fix formatting  
							
							
							
						 
						
							2019-09-04 21:40:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								e2011a667c 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/utils.ex  
							
							
							
						 
						
							2019-09-04 18:35:01 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								8306078de1 
								
							 
						 
						
							
							
								
								Apply suggestion to lib/pleroma/web/activity_pub/utils.ex  
							
							
							
						 
						
							2019-09-04 17:31:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								a890451187 
								
							 
						 
						
							
							
								
								fetch_announcements -> take_announcements  
							
							
							
						 
						
							2019-09-04 17:42:27 +03:00