Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								e1d2d69c87 
								
							 
						 
						
							
							
								
								Clean up views  
							
							
							
						 
						
							2019-09-23 22:33:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								4f548cb2b7 
								
							 
						 
						
							
							
								
								added test for Ostatus  
							
							
							
						 
						
							2019-09-12 10:25:43 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								37dd3867bb 
								
							 
						 
						
							
							
								
								Log admin/moderator actions  
							
							
							
						 
						
							2019-08-25 19:39:37 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a79ebac592 
								
							 
						 
						
							
							
								
								Improve AP routes rate limit  
							
							
							
						 
						
							2019-08-22 16:03:43 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								8d899d6197 
								
							 
						 
						
							
							
								
								Add :ap_routes rate limit  
							
							
							
						 
						
							2019-08-20 22:10:36 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								159bbec570 
								
							 
						 
						
							
							
								
								added tests for OstatusController  
							
							
							
						 
						
							2019-07-29 05:02:20 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								5104f65b69 
								
							 
						 
						
							
							
								
								Wrap error messages into gettext helpers  
							
							
							
						 
						
							2019-07-10 18:10:09 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								debf7f016d 
								
							 
						 
						
							
							
								
								ostatus: use preload objects with Object.normalize() when opportunistic  
							
							
							
						 
						
							2019-03-23 03:05:57 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9e0686efa6 
								
							 
						 
						
							
							
								
								Move visibility into own module.  
							
							
							
						 
						
							2019-02-22 13:29:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								5a4e2905fe 
								
							 
						 
						
							
							
								
								Merge branch 'fix/twittercards' into 'develop'  
							
							... 
							
							
							
							Fix Twitter Cards
See merge request pleroma/pleroma!815  
							
						 
						
							2019-02-22 04:38:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								1803d9a022 
								
							 
						 
						
							
							
								
								fix fetching AP objects with application/json  
							
							
							
						 
						
							2019-02-20 20:45:40 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4bfc628ca 
								
							 
						 
						
							
							
								
								Player: allow styles on CSP, loop videos  
							
							
							
						 
						
							2019-02-19 18:56:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aa9af1d639 
								
							 
						 
						
							
							
								
								CSP: Allow iframes on embed player  
							
							
							
						 
						
							2019-02-19 18:19:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2d21ea1a0e 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into fix/twittercards  
							
							
							
						 
						
							2019-02-19 16:58:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								10a11f083c 
								
							 
						 
						
							
							
								
								Embed player suitable for Twitter Cards  
							
							
							
						 
						
							2019-02-19 17:47:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								305d219413 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex 
							
						 
						
							2019-02-11 13:54:21 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251 
								
							 
						 
						
							
							
								
								de-group alias/es  
							
							
							
						 
						
							2019-02-09 16:31:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								60ea29dfe6 
								
							 
						 
						
							
							
								
								Credo fixes: alias grouping/ordering  
							
							
							
						 
						
							2019-02-09 14:59:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								3a3a3996b7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/federator/federator.ex 
							
						 
						
							2019-02-04 20:50:28 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								d3677d2b4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'MAIN/develop' into feature/jobs  
							
							
							
						 
						
							2019-01-31 15:07:49 +07: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								55affbca7f 
								
							 
						 
						
							
							
								
								add a job queue  
							
							
							
						 
						
							2019-01-28 22:17:17 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								d3f9e6f6fe 
								
							 
						 
						
							
							
								
								[ #534 ] Merged upstream/develop.  
							
							
							
						 
						
							2019-01-28 15:39:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								9560abea10 
								
							 
						 
						
							
							
								
								[ #534 ] Refactoring / tweaks per MR review.  
							
							
							
						 
						
							2019-01-28 11:03:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								71bb90073b 
								
							 
						 
						
							
							
								
								/notice/:id - send the FE index even if 404  
							
							... 
							
							
							
							this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page 
							
						 
						
							2019-01-27 22:51:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c9b418e547 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'oembed_provider'  
							
							... 
							
							
							
							# Conflicts:
#   lib/pleroma/activity.ex 
							
						 
						
							2019-01-25 05:00:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8654a591f0 
								
							 
						 
						
							
							
								
								[ #534 ] Updating external instances reachability on incoming federation.  
							
							
							
						 
						
							2019-01-24 17:37:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								98c8184c1f 
								
							 
						 
						
							
							
								
								Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1  
							
							
							
						 
						
							2019-01-21 08:00:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								44693fbf6e 
								
							 
						 
						
							
							
								
								Formating  
							
							
							
						 
						
							2019-01-20 01:28:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								afd83db0d7 
								
							 
						 
						
							
							
								
								Provide local og:url for remote activities  
							
							
							
						 
						
							2019-01-19 10:58:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1b1af4798a 
								
							 
						 
						
							
							
								
								Use object instead of activity for metadata  
							
							
							
						 
						
							2019-01-18 09:32:52 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								dd1432d695 
								
							 
						 
						
							
							
								
								Disable previews for any activity, but create  
							
							
							
						 
						
							2019-01-16 09:42:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ff6c9a5c96 
								
							 
						 
						
							
							
								
								Introduce get_by_id in Activity, replace newlines with spaces  
							
							
							
						 
						
							2019-01-15 20:00:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e4dc3f71ae 
								
							 
						 
						
							
							
								
								Resolve merge conflict  
							
							
							
						 
						
							2019-01-13 13:38:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sxsdv1 
								
							 
						 
						
							
							
							
							
								
							
							
								20c0dd1e24 
								
							 
						 
						
							
							
								
								Support activity+json request for activity  
							
							
							
						 
						
							2019-01-09 09:33:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b1860fe85a 
								
							 
						 
						
							
							
								
								Instance/Static runtime plug  
							
							... 
							
							
							
							This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used. 
							
						 
						
							2018-12-17 22:50:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									raeno 
								
							 
						 
						
							
							
							
							
								
							
							
								46486595ff 
								
							 
						 
						
							
							
								
								Handle "users/:id" links as well. Fix comments in MR.  
							
							
							
						 
						
							2018-12-14 19:55:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									raeno 
								
							 
						 
						
							
							
							
							
								
							
							
								b5de7c4c4d 
								
							 
						 
						
							
							
								
								Remove oembed for now, will submit it in another MR. Fix warnings  
							
							
							
						 
						
							2018-12-13 22:34:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									raeno 
								
							 
						 
						
							
							
							
							
								
							
							
								018516d3f3 
								
							 
						 
						
							
							
								
								Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links  
							
							
							
						 
						
							2018-12-13 22:21:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									raeno 
								
							 
						 
						
							
							
							
							
								
							
							
								9b3a6cdb07 
								
							 
						 
						
							
							
								
								Extract opengraph/oembed into separate module  
							
							
							
						 
						
							2018-12-13 22:17:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									raeno 
								
							 
						 
						
							
							
							
							
								
							
							
								d903e34cac 
								
							 
						 
						
							
							
								
								Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata  
							
							
							
						 
						
							2018-12-13 22:17:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									raeno 
								
							 
						 
						
							
							
							
							
								
							
							
								8902942128 
								
							 
						 
						
							
							
								
								WIP. Implement oembed route and handle both json/xml for "Note" type activity  
							
							
							
						 
						
							2018-12-13 22:17:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									raeno 
								
							 
						 
						
							
							
							
							
								
							
							
								21afdf6d99 
								
							 
						 
						
							
							
								
								Insert meta tags into static index.html on the fly for OStatus#notice  
							
							
							
						 
						
							2018-12-13 22:17:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bcecdc3ab1 
								
							 
						 
						
							
							
								
								Various runtime configuration fixes  
							
							
							
						 
						
							2018-11-19 10:09:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								98795172a7 
								
							 
						 
						
							
							
								
								ostatus controller: respond with AS2 objects instead of activities to notice URIs  
							
							
							
						 
						
							2018-11-17 22:10:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6fe23c5458 
								
							 
						 
						
							
							
								
								Runtime configured router  
							
							
							
						 
						
							2018-11-05 15:19:03 +01:00