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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0dc8f3d6d2 
								
							 
						 
						
							
							
								
								/api/ap/uploadMedia → /api/ap/upload_media  
							
							 
							
							
							
						 
						
							2019-09-24 19:03:06 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								815b904508 
								
							 
						 
						
							
							
								
								Add support for AP C2S uploadMedia  
							
							 
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171  
							
						 
						
							2019-09-23 20:00:12 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2ad50583f0 
								
							 
						 
						
							
							
								
								Document and test /api/ap/whoami  
							
							 
							
							
							
						 
						
							2019-09-23 19:47:35 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								447514dfa2 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed in 2019  
							
							 
							
							... 
							
							
							
							Done via the following command:
git diff 1e6c102bfc  --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' 
							
						 
						
							2019-09-18 23:21:11 +02: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								769fb778d4 
								
							 
						 
						
							
							
								
								Track object/create activity fetches  
							
							 
							
							
							
						 
						
							2019-09-12 21:37:36 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								11e12b5761 
								
							 
						 
						
							
							
								
								Add Pleroma.Plugs.Cache  
							
							 
							
							
							
						 
						
							2019-09-09 18:53:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e0f84d0043 
								
							 
						 
						
							
							
								
								Fix ActivityPubController.read_inbox/2  
							
							 
							
							
							
						 
						
							2019-09-10 01:11:57 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								a90ea8ba15 
								
							 
						 
						
							
							
								
								[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).  
							
							 
							
							
							
						 
						
							2019-08-31 19:08:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								e890ea7e82 
								
							 
						 
						
							
							
								
								[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 
						
							2019-08-31 14:25:43 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								399ca9133b 
								
							 
						 
						
							
							
								
								fix test  
							
							 
							
							
							
						 
						
							2019-08-22 21:54:37 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								256ff09aa8 
								
							 
						 
						
							
							
								
								[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs 
							
						 
						
							2019-08-22 20:59:58 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								64bfb41c55 
								
							 
						 
						
							
							
								
								fixed unfollow for relay actor  
							
							 
							
							
							
						 
						
							2019-08-22 06:57:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								a320358703 
								
							 
						 
						
							
							
								
								added test helpers to clear config after tests  
							
							 
							
							
							
						 
						
							2019-08-19 15:34:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								0e1c481a94 
								
							 
						 
						
							
							
								
								[ #1149 ] Added more oban workers. Refactoring.  
							
							 
							
							
							
						 
						
							2019-08-13 20:20:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								267262491e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue  
							
							 
							
							
							
						 
						
							2019-08-09 20:09:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								b7fad8d395 
								
							 
						 
						
							
							
								
								[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.  
							
							 
							
							
							
						 
						
							2019-08-09 20:08:01 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								e8ad116c2a 
								
							 
						 
						
							
							
								
								Do not add the "next" key to likes.json if there is no more items  
							
							 
							
							
							
						 
						
							2019-08-04 17:13:06 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								3d23a12d75 
								
							 
						 
						
							
							
								
								tests: add test for fetching the internal fetch actor  
							
							 
							
							
							
						 
						
							2019-07-17 17:48:08 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								97b79efbcd 
								
							 
						 
						
							
							
								
								ActivityPub Controller: Actually pass for_user to following/followers  
							
							 
							
							... 
							
							
							
							views and give 403 errors when trying to request hidden follower pages
when unauthenticated 
							
						 
						
							2019-07-12 20:54:20 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1f6ac7680d 
								
							 
						 
						
							
							
								
								ActivityPub User view: Following/Followers refactoring  
							
							 
							
							... 
							
							
							
							- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it 
							
						 
						
							2019-07-12 19:41:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								829e997223 
								
							 
						 
						
							
							
								
								[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/object.ex
#	test/web/activity_pub/transmogrifier_test.exs
#	test/web/ostatus/ostatus_test.exs 
							
						 
						
							2019-07-09 21:46:16 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								abe2e8881f 
								
							 
						 
						
							
							
								
								Testing: Don't federate in testing.  
							
							 
							
							
							
						 
						
							2019-07-09 15:30:51 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								daff85a985 
								
							 
						 
						
							
							
								
								[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.  
							
							 
							
							
							
						 
						
							2019-07-08 19:53:02 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								2bbc2a801f 
								
							 
						 
						
							
							
								
								Remove all follower collections but actor's from "cc"  
							
							 
							
							
							
						 
						
							2019-06-01 03:26:45 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor 
								
							 
						 
						
							
							
							
							
								
							
							
								b9cdf6d3b9 
								
							 
						 
						
							
							
								
								Use User.get_cached* everywhere  
							
							 
							
							
							
						 
						
							2019-04-22 07:20:43 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								750b369d04 
								
							 
						 
						
							
							
								
								activitypub: allow indirect messages from users being followed at a personal inbox  
							
							 
							
							
							
						 
						
							2019-04-16 18:31:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								1b3d921921 
								
							 
						 
						
							
							
								
								change Repo.get(User, id) => User.get_by_id(id)  
							
							 
							
							
							
						 
						
							2019-04-02 17:01:26 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							 
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									KZ 
								
							 
						 
						
							
							
							
							
								
							
							
								7c722c08f5 
								
							 
						 
						
							
							
								
								Fix: Fixing an outbox related bug when local user activity is empty  
							
							 
							
							
							
						 
						
							2019-02-22 04:37:48 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e95dbecf3e 
								
							 
						 
						
							
							
								
								tests: fix formatting  
							
							 
							
							
							
						 
						
							2019-02-20 20:49:10 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								aa45674be6 
								
							 
						 
						
							
							
								
								tests: add test for fetching AP objects with application/json.  
							
							 
							
							
							
						 
						
							2019-02-20 20:45:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								19756d68f2 
								
							 
						 
						
							
							
								
								Merge branch 'fix/credo-issues-test' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix credo issues in ./test
See merge request pleroma/pleroma!808  
							
						 
						
							2019-02-14 03:55:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e031cc6473 
								
							 
						 
						
							
							
								
								tests: update tests for totalItems leak fix  
							
							 
							
							
							
						 
						
							2019-02-14 03:22:54 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8bb7e19b38 
								
							 
						 
						
							
							
								
								test: de-group alias/es  
							
							 
							
							
							
						 
						
							2019-02-11 03:44:15 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								74518d0b60 
								
							 
						 
						
							
							
								
								hide_followings was renamed to hide_followers in the FE, but never synced up in the BE  
							
							 
							
							... 
							
							
							
							This was a dirty regex replace which worked on my server 
							
						 
						
							2019-02-06 22:34:44 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								16ce129e38 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings (fixed)  
							
							 
							
							
							
						 
						
							2019-02-03 21:55:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								486749064f 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'feature/split-hide-network' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts merge request !733  
							
						 
						
							2019-02-01 20:22:58 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								0a82a7e6d6 
								
							 
						 
						
							
							
								
								Merge branch 'feature/split-hide-network' into 'develop'  
							
							 
							
							... 
							
							
							
							Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733  
							
						 
						
							2019-02-01 17:05:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								92753b0cd9 
								
							 
						 
						
							
							
								
								[ #534 ] Made federation push sender be determined basing on content instead of referer header. Updated tests.  
							
							 
							
							
							
						 
						
							2019-01-29 13:12:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								50d6183893 
								
							 
						 
						
							
							
								
								Split hide_network into hide_followers & hide_followings  
							
							 
							
							
							
						 
						
							2019-01-28 21:40:08 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1d2f41642c 
								
							 
						 
						
							
							
								
								[ #534 ] Various tweaks. Tests for Instances and Instance.  
							
							 
							
							
							
						 
						
							2019-01-28 15:25:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d99650270b 
								
							 
						 
						
							
							
								
								[ #534 ] Federation reachability filtering tests.  
							
							 
							
							
							
						 
						
							2019-01-25 20:38:54 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								581edd5a91 
								
							 
						 
						
							
							
								
								Add route to get object like activities  
							
							 
							
							
							
						 
						
							2019-01-12 20:24:38 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								36711e1c83 
								
							 
						 
						
							
							
								
								Handle client submitted activitypub like activity  
							
							 
							
							
							
						 
						
							2019-01-12 20:24:35 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								20c0dd1e24 
								
							 
						 
						
							
							
								
								Support activity+json request for activity  
							
							 
							
							
							
						 
						
							2019-01-09 09:33:30 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								2d7da5f437 
								
							 
						 
						
							
							
								
								Don't crash on AP request for tombstone  
							
							 
							
							... 
							
							
							
							Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api 
							
						 
						
							2019-01-05 11:16:05 +01:00