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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								38245f1336 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							 
							
							
							
						 
						
							2019-09-23 21:32:50 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									D Anzorge 
								
							 
						 
						
							
							
							
							
								
							
							
								9aca2cc95d 
								
							 
						 
						
							
							
								
								Add test for correct AP outbox pagination  
							
							 
							
							
							
						 
						
							2019-09-19 16:49:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d4ed3a35b8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							 
							
							
							
						 
						
							2019-09-19 07:35:34 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b0ec82d24a 
								
							 
						 
						
							
							
								
								Merge branch 'chores/bump-copyright-year' into 'develop'  
							
							 
							
							... 
							
							
							
							Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698  
							
						 
						
							2019-09-18 21:57:49 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								96816ceaa2 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-4fabf83a' into 'develop'"  
							
							 
							
							... 
							
							
							
							This reverts commit fe7fd33126 , reversing
changes made to 4fabf83ad0 . 
							
						 
						
							2019-09-16 17:55:04 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e8120944d8 
								
							 
						 
						
							
							
								
								Fix signed fetch inclusion publisher test  
							
							 
							
							... 
							
							
							
							Oban branch changed `actor` to `actor_id` and this test was not adjusted for that 
							
						 
						
							2019-09-16 13:23:06 +03: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								a9b78f55e3 
								
							 
						 
						
							
							
								
								Merge branch 'capture-test-errors' into 'develop'  
							
							 
							
							... 
							
							
							
							Capture test error messages where appropriate
See merge request pleroma/pleroma!1665  
							
						 
						
							2019-09-13 17:07:14 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ba70a8cae6 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/delivery-tracking  
							
							 
							
							
							
						 
						
							2019-09-13 19:42:53 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									stwf 
								
							 
						 
						
							
							
							
							
								
							
							
								25a64a4aa0 
								
							 
						 
						
							
							
								
								Capture test error messages where appropriate  
							
							 
							
							
							
						 
						
							2019-09-13 11:46:41 -04: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2b40e57a72 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into test/activity_pub/transmogrifier.ex  
							
							 
							
							
							
						 
						
							2019-09-13 06:55:05 +03:00