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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								e94c3442f4 
								
							 
						 
						
							
							
								
								updates  
							
							
							
						 
						
							2018-12-10 13:27:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								a09ed0f5af 
								
							 
						 
						
							
							
								
								avoid mix format bug  
							
							
							
						 
						
							2018-12-06 18:41:29 +09: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								87109482f3 
								
							 
						 
						
							
							
								
								status_code -> status  
							
							
							
						 
						
							2018-12-04 14:04:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d0ec2812bd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into validate-user-info  
							
							
							
						 
						
							2018-11-30 17:34:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d088ac6286 
								
							 
						 
						
							
							
								
								Fix OStatus user updates.  
							
							... 
							
							
							
							Breaks banner updating. 
							
						 
						
							2018-11-30 17:21:58 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								e6d246882d 
								
							 
						 
						
							
							
								
								federator: don't federate anything other than Note objects to OStatus  
							
							
							
						 
						
							2018-11-10 10:06:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6fe23c5458 
								
							 
						 
						
							
							
								
								Runtime configured router  
							
							
							
						 
						
							2018-11-05 15:19:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								440b459cd1 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/announce-timeline-flooding' into 'develop'  
							
							... 
							
							
							
							activitypub: filter destination list for announce activities differently than normal (closes  #164 )
Closes  #164 
See merge request pleroma/pleroma!227  
							
						 
						
							2018-08-27 08:25:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								0899588e4d 
								
							 
						 
						
							
							
								
								ostatus: return AS2 objects on /notice and /activities URLs like with /objects.  
							
							
							
						 
						
							2018-07-12 17:15:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6f4ca7ddf7 
								
							 
						 
						
							
							
								
								ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().  
							
							
							
						 
						
							2018-06-27 13:08:05 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								bc05548370 
								
							 
						 
						
							
							
								
								ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.  
							
							
							
						 
						
							2018-06-27 13:07:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								6f384d35dd 
								
							 
						 
						
							
							
								
								ostatus: we need to include the original author of a message as a mention  
							
							... 
							
							
							
							this is due to the use of activity.recipients which may not necessarily contain the original
author if the actors are not following each other. 
							
						 
						
							2018-06-18 05:27:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rachel H 
								
							 
						 
						
							
							
							
							
								
							
							
								fa0c2727d8 
								
							 
						 
						
							
							
								
								Fix users lookup/return type  
							
							... 
							
							
							
							* Allow viewing user in frontend by id on pageload 
							
						 
						
							2018-06-07 23:18:45 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								8073af6e10 
								
							 
						 
						
							
							
								
								Better error handling for OstatusController.  
							
							
							
						 
						
							2018-06-03 21:04:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								06439f64d0 
								
							 
						 
						
							
							
								
								Better error handling for ActivityPubController  
							
							
							
						 
						
							2018-06-03 19:58:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5e76adb07e 
								
							 
						 
						
							
							
								
								Fix url guessing attacks.  
							
							
							
						 
						
							2018-05-30 20:00:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								d045b96f95 
								
							 
						 
						
							
							
								
								Add tests for incoming unfollow over OStatus  
							
							
							
						 
						
							2018-05-21 05:11:13 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								f2d6c3a512 
								
							 
						 
						
							
							
								
								Handle unfollows from OStatus  
							
							
							
						 
						
							2018-05-21 04:36:20 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								aeff2d6474 
								
							 
						 
						
							
							
								
								Merge branch 'feature/unrepeats' into 'develop'  
							
							... 
							
							
							
							Add unrepeats
Closes  #69 
See merge request pleroma/pleroma!113  
							
						 
						
							2018-05-13 09:32:29 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								271fb5ccb1 
								
							 
						 
						
							
							
								
								Probably better way of handling non-follow undos in ostatus  
							
							
							
						 
						
							2018-05-11 11:59:53 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								4151cbe6b2 
								
							 
						 
						
							
							
								
								Revert "Do not send non-follow undos over ostatus for now"  
							
							... 
							
							
							
							This reverts commit 07fdc07238 
							
						 
						
							2018-05-11 11:53:28 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								0b527b5528 
								
							 
						 
						
							
							
								
								Revert "Use [] instead of nil"  
							
							... 
							
							
							
							This reverts commit 42268b0981 
							
						 
						
							2018-05-11 11:53:06 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								42268b0981 
								
							 
						 
						
							
							
								
								Use [] instead of nil  
							
							
							
						 
						
							2018-05-11 01:48:56 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								07fdc07238 
								
							 
						 
						
							
							
								
								Do not send non-follow undos over ostatus for now  
							
							
							
						 
						
							2018-05-11 01:45:10 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Francis Dinh 
								
							 
						 
						
							
							
							
							
								
							
							
								4d5ec883b7 
								
							 
						 
						
							
							
								
								Federate correct activity  
							
							
							
						 
						
							2018-05-08 21:52:21 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								636f0fa402 
								
							 
						 
						
							
							
								
								Clean up unused aliases and imports  
							
							
							
						 
						
							2018-05-04 21:25:31 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eal 
								
							 
						 
						
							
							
							
							
								
							
							
								22bfeac256 
								
							 
						 
						
							
							
								
								Update note count in ActivityPub.create.  
							
							
							
						 
						
							2018-04-21 12:58:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9e6ae44729 
								
							 
						 
						
							
							
								
								Formatting fixes.  
							
							
							
						 
						
							2018-04-21 09:43:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4afbef39f4 
								
							 
						 
						
							
							
								
								Format the code.  
							
							
							
						 
						
							2018-03-30 15:01:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								46f63ea8af 
								
							 
						 
						
							
							
								
								Fix atom feed pagination.  
							
							
							
						 
						
							2018-03-26 09:51:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								9b97b023c5 
								
							 
						 
						
							
							
								
								Merge branch 'feld-Logger' into 'develop'  
							
							... 
							
							
							
							Logging cleanup
See merge request pleroma/pleroma!76  
							
						 
						
							2018-03-20 05:57:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								7430ff9173 
								
							 
						 
						
							
							
								
								Capitalize Atom  
							
							
							
						 
						
							2018-03-19 17:44:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4d5161b16d 
								
							 
						 
						
							
							
								
								Only fetch if it's http.  
							
							
							
						 
						
							2018-03-19 10:28:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fcf1937a40 
								
							 
						 
						
							
							
								
								Correctly handle unlisted messages coming in through Ostatus.  
							
							
							
						 
						
							2018-03-07 15:45:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b82637f32d 
								
							 
						 
						
							
							
								
								Don't use special query for feed.  
							
							
							
						 
						
							2018-03-06 16:04:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0e9bd6d148 
								
							 
						 
						
							
							
								
								Hotfix for tag problems.  
							
							
							
						 
						
							2018-02-24 22:28:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fa3aa59248 
								
							 
						 
						
							
							
								
								Add missing alias.  
							
							
							
						 
						
							2018-02-24 13:11:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fb02300234 
								
							 
						 
						
							
							
								
								Pleroma AP detection mechanism.  
							
							
							
						 
						
							2018-02-24 13:06:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2583a9f6e8 
								
							 
						 
						
							
							
								
								More logging.  
							
							
							
						 
						
							2018-02-23 15:00:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								313f186a66 
								
							 
						 
						
							
							
								
								Ostatus: Use all recipients as mentions.  
							
							
							
						 
						
							2018-02-19 08:34:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ae26604378 
								
							 
						 
						
							
							
								
								ActivityPub: Refactor create function.  
							
							
							
						 
						
							2018-02-15 19:59:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								b331cb449a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/activitypub  
							
							
							
						 
						
							2018-02-12 10:24:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								ae1ec858f4 
								
							 
						 
						
							
							
								
								Basic AP user building.  
							
							
							
						 
						
							2018-02-11 17:20:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Roger Braun 
								
							 
						 
						
							
							
							
							
								
							
							
								52200998c9 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/activitypub  
							
							
							
						 
						
							2018-02-11 09:50:55 +01:00