kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4afe1359b
								
							
						 | 
						
							
							
								
								Merge branch 'activitypub-dereference-activity-id' into 'develop'
							
							
							
							
							
							
							
							Support activity+json request for activity
See merge request pleroma/pleroma!641 
							
						 | 
						
							2019-01-10 18:42:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								7f5efddd6e
								
							
						 | 
						
							
							
								
								Merge branch 'feature/pinned-posts' into 'develop'
							
							
							
							
							
							
							
							Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636 
							
						 | 
						
							2019-01-10 02:39:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5027f82cde
								
							
						 | 
						
							
							
								
								Add activity visibility index.
							
							
							
							
							
						 | 
						
							2019-01-09 16:45:09 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								20c0dd1e24
								
							
						 | 
						
							
							
								
								Support activity+json request for activity
							
							
							
							
							
						 | 
						
							2019-01-09 09:33:30 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								380e9fba21
								
							
						 | 
						
							
							
								
								add pinned posts
							
							
							
							
							
						 | 
						
							2019-01-07 20:45:33 +07: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e1cc2bab6
								
							
						 | 
						
							
							
								
								Implement delete activity
							
							
							
							
							
						 | 
						
							2019-01-01 23:20:43 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								551c3d9391
								
							
						 | 
						
							
							
								
								Split create activity specifics from update_outbox
							
							
							
							
							
						 | 
						
							2019-01-01 23:20:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								096a927805
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into pool-usage
							
							
							
							
							
						 | 
						
							2019-01-01 14:19:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d4799e0dc2
								
							
						 | 
						
							
							
								
								Remove default pool, it's used automatically anyway.
							
							
							
							
							
						 | 
						
							2019-01-01 13:49:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								980b5288ed
								
							
						 | 
						
							
							
								
								update copyright years to 2019
							
							
							
							
							
						 | 
						
							2018-12-31 15:41:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								f40562b4e1
								
							
						 | 
						
							
							
								
								Respond with full activity to outbox post
							
							
							
							
							
						 | 
						
							2018-12-30 12:01:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								1e781715c8
								
							
						 | 
						
							
							
								
								Limit activity types accepted to outbox to only 'Create'
							
							
							
							
							
						 | 
						
							2018-12-30 12:01:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								569bad8210
								
							
						 | 
						
							
							
								
								Create activity when client posts to outbox
							
							
							
							
							
						 | 
						
							2018-12-30 12:01:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								26dc2dddab
								
							
						 | 
						
							
							
								
								Implement ActivityPub inbox view
							
							
							
							
							
							
							
							More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported 
							
						 | 
						
							2018-12-30 12:01:39 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									sxsdv1
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa082ca7b6
								
							
						 | 
						
							
							
								
								Wire up stub routes for client calls of activitypub inbox/outbox
							
							
							
							
							
							
							
							Code style: remove wrapping function of outbox 
							
						 | 
						
							2018-12-29 22:22:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								3dc5f04976
								
							
						 | 
						
							
							
								
								Merge branch 'carrot-bullying' into 'develop'
							
							
							
							
							
							
							
							Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595 
							
						 | 
						
							2018-12-29 11:46:06 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Vyr Cossont
								
							 
						 | 
						
							
							
							
							
								
							
							
								e4562105e7
								
							
						 | 
						
							
							
								
								Implement exclude_reblogs and include_rts
							
							
							
							
							
						 | 
						
							2018-12-26 21:38:00 -08:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5811e65e67
								
							
						 | 
						
							
							
								
								Add some hard limits on inserted activities.
							
							
							
							
							
						 | 
						
							2018-12-26 12:39:35 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2791ce9a1f
								
							
						 | 
						
							
							
								
								add license boilerplate to pleroma core
							
							
							
							
							
						 | 
						
							2018-12-23 20:56:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								71f6d9f418
								
							
						 | 
						
							
							
								
								transmogrifier: significantly rework handling of peertube videos, add test
							
							
							
							
							
						 | 
						
							2018-12-23 13:31:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
							
							
								
							
							
								3aff8067e4
								
							
						 | 
						
							
							
								
								transmogrifier: When it’s a Video move "url" to "attachment"
							
							
							
							
							
						 | 
						
							2018-12-23 13:00:25 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								a7f07bb6e5
								
							
						 | 
						
							
							
								
								Implement kaniini's tweaks
							
							
							
							
							
						 | 
						
							2018-12-23 12:24:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								c76179419d
								
							
						 | 
						
							
							
								
								Renamed the things
							
							
							
							
							
						 | 
						
							2018-12-23 11:14:29 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								409ff60bf8
								
							
						 | 
						
							
							
								
								Fix formatting
							
							
							
							
							
						 | 
						
							2018-12-22 23:32:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Karen Konou
								
							 
						 | 
						
							
							
							
							
								
							
							
								92362e1e22
								
							
						 | 
						
							
							
								
								Implement large thread filter
							
							
							
							
							
						 | 
						
							2018-12-22 23:18:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								074fa790ba
								
							
						 | 
						
							
							
								
								fix compile warnings
							
							
							
							
							
						 | 
						
							2018-12-09 20:50:08 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								abead01ab6
								
							
						 | 
						
							
							
								
								Merge branch 'correct-and-improve-http-options' into 'develop'
							
							
							
							
							
							
							
							Correct and improve http options
See merge request pleroma/pleroma!505 
							
						 | 
						
							2018-12-06 15:57:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0adea30b3
								
							
						 | 
						
							
							
								
								Merge branch 're-mrf' into 'develop'
							
							
							
							
							
							
							
							Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499 
							
						 | 
						
							2018-12-06 15:36:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scarlett
								
							 
						 | 
						
							
							
							
							
								
							
							
								d27e3f269f
								
							
						 | 
						
							
							
								
								Rename regular expression 'have_re' to 'reply_prefix'.
							
							
							
							
							
						 | 
						
							2018-12-06 14:00:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scarlett
								
							 
						 | 
						
							
							
							
							
								
							
							
								3dff61ebec
								
							
						 | 
						
							
							
								
								Harden re: detection.
							
							
							
							
							
						 | 
						
							2018-12-06 13:48:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scarlett
								
							 
						 | 
						
							
							
							
							
								
							
							
								6a6aaa0e1a
								
							
						 | 
						
							
							
								
								Use object.normalize.
							
							
							
							
							
						 | 
						
							2018-12-06 11:37:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								a09ed0f5af
								
							
						 | 
						
							
							
								
								avoid mix format bug
							
							
							
							
							
						 | 
						
							2018-12-06 18:41:29 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								ccf0b46dd6
								
							
						 | 
						
							
							
								
								Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
							
							
							
							
							
							
							
							[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496 
							
						 | 
						
							2018-12-06 07:36:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e90f688f1
								
							
						 | 
						
							
							
								
								[#210] Mastodon: actor storing for media uploads, ownership check to update_media.
							
							
							
							
							
							
							
							Refactoring. 
							
						 | 
						
							2018-12-06 10:26:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								96ba95df2e
								
							
						 | 
						
							
							
								
								remove follow_redirect options
							
							
							
							
							
						 | 
						
							2018-12-06 11:38:33 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								27792b2d77
								
							
						 | 
						
							
							
								
								remove pool and timeout options which duplicate with the default
							
							
							
							
							
						 | 
						
							2018-12-06 11:23:15 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								76d6b1c6ab
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into follower-hiding
							
							
							
							
							
						 | 
						
							2018-12-05 21:27:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3b5be09f45
								
							
						 | 
						
							
							
								
								[#210] Stylistic change.
							
							
							
							
							
						 | 
						
							2018-12-05 21:48:21 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c4f3c5e939
								
							
						 | 
						
							
							
								
								[#210] Stylistic change.
							
							
							
							
							
						 | 
						
							2018-12-05 20:23:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								848151f7cb
								
							
						 | 
						
							
							
								
								[#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check
							
							
							
							
							
							
							
							to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring. 
							
						 | 
						
							2018-12-05 13:37:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scarlett
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a1df182cf
								
							
						 | 
						
							
							
								
								Add a MRF Policy for appending re: to identical subjects in replies.
							
							
							
							
							
						 | 
						
							2018-12-04 23:35:07 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								114b95cee2
								
							
						 | 
						
							
							
								
								Merge branch 'feature/integration_tesla' into 'develop'
							
							
							
							
							
							
							
							[#354] Move all http interactions to Tesla
See merge request pleroma/pleroma!487 
							
						 | 
						
							2018-12-04 18:41:00 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								b57d83e3c9
								
							
						 | 
						
							
							
								
								MRF: simple policy: fix media removal
							
							
							
							
							
						 | 
						
							2018-12-04 18:30:01 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								87109482f3
								
							
						 | 
						
							
							
								
								status_code -> status
							
							
							
							
							
						 | 
						
							2018-12-04 14:04:06 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								6be0ab1e55
								
							
						 | 
						
							
							
								
								Hide network in ap.
							
							
							
							
							
						 | 
						
							2018-12-02 17:35:32 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								c443c9bd72
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
							
							
							
							
							
						 | 
						
							2018-12-01 09:55:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602
								
							
						 | 
						
							
							
								
								reverse proxy / uploads
							
							
							
							
							
						 | 
						
							2018-11-30 18:00:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d0ec2812bd
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin' into validate-user-info
							
							
							
							
							
						 | 
						
							2018-11-30 17:34:20 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8f1fffebc6
								
							
						 | 
						
							
							
								
								Fix transmogrifier test.
							
							
							
							
							
						 | 
						
							2018-11-30 17:31:05 +01:00 | 
						
						
							
							
							
								
							
							
						 |