5c75fe4c14  
						 
						
							
							
								
								
								Avoid possible problems with numeric nicknames and GNU Social  
							
							 
							
							
							
						 
						
							2017-04-09 04:29:02 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c94525938d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1704-duplicate-feed  
							
							 
							
							
							
						 
						
							2017-04-08 10:05:01 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	8786bcdf0a  
						 
						
							
							
								
								
								Avoid duplicates with feeds and "remote self"  
							
							 
							
							
							
						 
						
							2017-04-08 08:12:14 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	56c0675fba  
						 
						
							
							
								
								
								Merge pull request  #3295  from Hypolite/issue/#3274  
							
							 
							
							... 
							
							
							
							Friendica code blocks aren't rendered in Diaspora 
							
						 
						
							2017-04-07 22:59:44 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6060f311e9  
						 
						
							
							
								
								
								small fix for  #3254  
							
							 
							
							
							
						 
						
							2017-04-07 11:26:11 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	b0accf4d4c  
						 
						
							
							
								
								
								Fix code blocks to Diaspora  
							
							 
							
							... 
							
							
							
							- Extracts code blocks before BBCode conversion to prevent code
highlighting and whitespace meddling
- Use the improved HTLM To Markdown library
- Use <code>  instead of <key> for Diaspora inline code blocks 
							
						 
						
							2017-04-06 23:49:56 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	8149e21add  
						 
						
							
							
								
								
								Enforce standards  
							
							 
							
							
							
						 
						
							2017-04-06 23:43:55 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	1ab28bbe03  
						 
						
							
							
								
								
								Add Text_Highlighter to Composer  
							
							 
							
							... 
							
							
							
							- Fixes critical mistake in boot.php regarding set_include_path
- Fixes minor mistake in text.php regarding strpos order of arguments
Note: This change significantly increases Composer running time because
Text_Highlither is a PEAR package. I'm already planning to replace it
with scrivo/highlight.php. 
							
						 
						
							2017-04-05 00:31:49 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9237b2611a  
						 
						
							
							
								
								
								Merge branch 'develop' into rewrites/coding-convention-split2  
							
							 
							
							
							
						 
						
							2017-04-03 06:35:27 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c574c317ef  
						 
						
							
							
								
								
								Removed unneeded comment  
							
							 
							
							
							
						 
						
							2017-04-02 20:43:54 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	884c75a350  
						 
						
							
							
								
								
								Issue 3278: Attachments in Reshares should now work  
							
							 
							
							
							
						 
						
							2017-04-02 19:18:11 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d9451ef969  
						 
						
							
							
								
								
								Merge pull request  #3279  from Hypolite/improvement/add-composer  
							
							 
							
							... 
							
							
							
							Add Composer 
							
						 
						
							2017-04-02 14:57:37 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	94f3f0887b  
						 
						
							
							
								
								
								Issue 2957: The avatar problem with mastodon should now finally be solved  
							
							 
							
							
							
						 
						
							2017-04-02 12:37:22 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	54f49169d4  
						 
						
							
							
								
								
								Show real platform names  
							
							 
							
							
							
						 
						
							2017-04-02 07:53:55 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	07fd61b912  
						 
						
							
							
								
								
								Mastodon: plink for reshares, missing hostnames for avatars  
							
							 
							
							
							
						 
						
							2017-04-01 23:39:19 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roland Häder 
								
							 
						 
						
							
							
								
							
							
	49527b70d3  
						 
						
							
							
								
								
								Merge branch 'develop' into rewrites/coding-convention-split2  
							
							 
							
							
							
						 
						
							2017-04-01 22:16:08 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	16d4392573  
						 
						
							
							
								
								
								Documentation added  
							
							 
							
							
							
						 
						
							2017-04-01 09:05:56 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f6d7ee2781  
						 
						
							
							
								
								
								Issue 3142: mcrypt is no more (as well as phpseclib)  
							
							 
							
							
							
						 
						
							2017-04-01 08:28:42 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	799e60aa62  
						 
						
							
							
								
								
								Replace existing autoloader with Composer-supplied  
							
							 
							
							... 
							
							
							
							- Move Friendica namespace to `src`
- Move required `ezyang/htmlpurifier` to vendor
- Remove existing static autoloader
- Change boot.php reference to the autoloader 
							
						 
						
							2017-03-31 23:02:38 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	8bdc906013 
 
						 
						
							
							
								
								
								Continued a bit:  
							
							 
							
							... 
							
							
							
							- added 'array' type-hint which is valid for many versions back
- added spaces as requested by CR
- removed $a = get_app(); call, $a was no longer needed here
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-31 20:42:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3796a141c6  
						 
						
							
							
								
								
								We don't need this include anymore  
							
							 
							
							
							
						 
						
							2017-03-31 06:25:48 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	1560534621  
						 
						
							
							
								
								
								Now it's openssl - and no copy&paste failure anymore  
							
							 
							
							
							
						 
						
							2017-03-31 06:22:43 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	973fcd3624  
						 
						
							
							
								
								
								Test with OpenSSL  
							
							 
							
							
							
						 
						
							2017-03-30 23:21:52 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	d091759888 
 
						 
						
							
							
								
								
								space to the rescue ... ;-) CR request  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-30 20:34:14 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	54c8fb2bb8  
						 
						
							
							
								
								
								Replaces mcrypt with phpsec.  
							
							 
							
							
							
						 
						
							2017-03-30 18:29:12 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4fc1ebd4ea  
						 
						
							
							
								
								
								Doing some Hypolyzation  
							
							 
							
							
							
						 
						
							2017-03-27 21:02:56 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c85331d8ac  
						 
						
							
							
								
								
								Reestablish the communication with Mastodon  
							
							 
							
							
							
						 
						
							2017-03-27 20:58:15 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	8580cd87a6  
						 
						
							
							
								
								
								Merge pull request  #3271  from Hypolite/issue/#3189  
							
							 
							
							... 
							
							
							
							Fix Diaspora code blocks being mangled 
							
						 
						
							2017-03-27 09:26:39 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fa7721c735  
						 
						
							
							
								
								
								Prevent Hypolite from doing comments about standards ;-)  
							
							 
							
							
							
						 
						
							2017-03-27 06:11:45 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	364d88fa70  
						 
						
							
							
								
								
								Only import new OStatus posts if they are from our followers  
							
							 
							
							
							
						 
						
							2017-03-27 05:33:43 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	3e285a690a  
						 
						
							
							
								
								
								Fix Diaspora code blocks being mangled  
							
							 
							
							... 
							
							
							
							- Remove whitespace removal code from `diaspora2bb()`
- Add code block skipping the HTML transforms removing whitespace in
`htm2bbcode()` 
							
						 
						
							2017-03-26 19:00:04 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	f1a75a57fe  
						 
						
							
							
								
								
								Merge pull request  #3257  from annando/1703-gcontact  
							
							 
							
							... 
							
							
							
							Improved gcontact handling 
							
						 
						
							2017-03-25 15:35:41 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	585c2119d7  
						 
						
							
							
								
								
								Remove the "call by reference"  
							
							 
							
							
							
						 
						
							2017-03-25 18:00:56 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	9ddb032bf2 
 
						 
						
							
							
								
								
								strange that this curly brace didn't make it in. now it is, thanks to @annando  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-25 18:32:33 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	33fa1e79af 
 
						 
						
							
							
								
								
								some spaces ...  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-25 18:32:21 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	444de52859  
						 
						
							
							
								
								
								Use of exceptions  
							
							 
							
							
							
						 
						
							2017-03-25 16:56:04 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6e35c49cb9  
						 
						
							
							
								
								
								Merge pull request  #3263  from annando/1601-api-statuses-lookup  
							
							 
							
							... 
							
							
							
							More GNU Social compatibility for the API 
							
						 
						
							2017-03-25 16:26:21 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	adf9ed64bb  
						 
						
							
							
								
								
								Avoid API error when calling "/api/friendica/profile/show"  
							
							 
							
							
							
						 
						
							2017-03-25 14:16:21 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	0e6b009425 
 
						 
						
							
							
								
								
								fixed another parser error, opps  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-25 15:04:07 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	fccdc63964 
 
						 
						
							
							
								
								
								Opps, fixed parser error. indending was confusing here  
							
							 
							
							... 
							
							
							
							+ added much more curly braces
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-25 14:56:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	a391ab9a99 
 
						 
						
							
							
								
								
								was a bit confusing for me or I was not sleeping to much ...  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-25 13:46:51 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	89bd080e7e 
 
						 
						
							
							
								
								
								don't kill when no result is found, this may break communication, thanks to @annando explaining it  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-25 13:42:09 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	6d5826e188 
 
						 
						
							
							
								
								
								PHP5 does not support native type-hints, except array + used dbm::is_result()  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-25 13:38:11 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	fd468f20fd 
 
						 
						
							
							
								
								
								merged 2 if() into one, closes internal TODO  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-25 13:08:56 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	47ae5a9a47 
 
						 
						
							
							
								
								
								removed parentheses, added curly ...  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-25 13:07:33 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	2f5c796886 
 
						 
						
							
							
								
								
								removed TODO, one day this all needs refacturizing ...  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-25 13:02:09 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a9dfd1fcb7  
						 
						
							
							
								
								
								One more API call added  
							
							 
							
							
							
						 
						
							2017-03-25 11:31:31 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4665cda00e  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup  
							
							 
							
							
							
						 
						
							2017-03-25 11:25:47 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0d49143a63  
						 
						
							
							
								
								
								"no_utf" wasn't in use anymore - it is now removed completely  
							
							 
							
							
							
						 
						
							2017-03-25 10:51:00 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a419bbe7c7  
						 
						
							
							
								
								
								Hypolite is right (not always, but in this case)  
							
							 
							
							
							
						 
						
							2017-03-25 10:11:02 +00:00