Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	a42595a30c  
						 
						
							
							
								
								
								Move Object\Contact to Model\Contact  
							
							 
							
							
							
						 
						
							2017-12-07 23:56:12 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	
	
	5747cfc79c 
 
						 
						
							
							
								
								
								Revert "Move Objects to Model"  
							
							 
							
							
							
						 
						
							2017-12-08 05:21:51 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	18d93cddf6  
						 
						
							
							
								
								
								Move Object\Contact to Model\Contact  
							
							 
							
							
							
						 
						
							2017-12-07 09:04:24 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ba184f9038  
						 
						
							
							
								
								
								Show the preview picture even if the posting contains the huge image  
							
							 
							
							
							
						 
						
							2017-11-25 16:00:51 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	5ee728972e  
						 
						
							
							
								
								
								Remove include/Contact.php  
							
							 
							
							... 
							
							
							
							- Remove all mentions to include/Contact.php 
							
						 
						
							2017-11-19 17:05:21 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	ec02af593d  
						 
						
							
							
								
								
								Change called method names  
							
							 
							
							... 
							
							
							
							- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship 
							
						 
						
							2017-11-19 17:03:39 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	b92fc24ff0  
						 
						
							
							
								
								
								Add Contact Object  
							
							 
							
							... 
							
							
							
							- Add Profile Object
- Add User Model
- Add use statements 
							
						 
						
							2017-11-19 16:55:28 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Magness 
								
							 
						 
						
							
							
								
							
							
	4d146acf90  
						 
						
							
							
								
								
								Smilies to src  
							
							 
							
							... 
							
							
							
							Move Smilies to Friendica\Content namespace.
Related to #3878  
							
						 
						
							2017-11-11 07:21:15 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Magness 
								
							 
						 
						
							
							
								
							
							
	06c3af9b60  
						 
						
							
							
								
								
								Move Cache to src  
							
							 
							
							... 
							
							
							
							relocate the cache class to Friendica\Core namespace 
							
						 
						
							2017-11-09 11:05:18 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Magness 
								
							 
						 
						
							
							
								
							
							
	0dfa57948f  
						 
						
							
							
								
								
								Issue-#3873  
							
							 
							
							... 
							
							
							
							Replace deprecated functions with new syntax. 
							
						 
						
							2017-11-07 06:24:39 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d739fe2503  
						 
						
							
							
								
								
								Issue 3860: Enhanced support of "!" for forums  
							
							 
							
							
							
						 
						
							2017-11-03 05:07:19 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d10eaefaa9  
						 
						
							
							
								
								
								Improved regular expression for the Diaspora link detection  
							
							 
							
							
							
						 
						
							2017-09-14 22:04:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	cb8581b29a  
						 
						
							
							
								
								
								Support for server independant Diaspora style links  
							
							 
							
							
							
						 
						
							2017-09-06 04:55:36 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5adfeb0bd5  
						 
						
							
							
								
								
								App::get_baseurl is now replaced with System::baseUrl  
							
							 
							
							
							
						 
						
							2017-08-26 07:32:10 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3c24bed412  
						 
						
							
							
								
								
								New class "System"  
							
							 
							
							
							
						 
						
							2017-08-26 06:04:21 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	85c49060e2  
						 
						
							
							
								
								
								Preparation for Unicode Emojis  
							
							 
							
							
							
						 
						
							2017-08-20 19:47:00 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	17b05c9ad9  
						 
						
							
							
								
								
								Hash tag links now do a redir  
							
							 
							
							
							
						 
						
							2017-08-19 09:22:50 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3c59eefa22  
						 
						
							
							
								
								
								Shared posts to Libertree now look better.  
							
							 
							
							
							
						 
						
							2017-08-14 19:16:28 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	ad4cdf2a9d  
						 
						
							
							
								
								
								Replace lowercase operators  
							
							 
							
							
							
						 
						
							2017-06-08 21:03:44 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9c0d2c31e8  
						 
						
							
							
								
								
								Replace AND and OR in PHP conditions by && and ||  
							
							 
							
							
							
						 
						
							2017-06-07 22:00:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3db3d2f1f7  
						 
						
							
							
								
								
								This should make posts fine on GNU Social as well  
							
							 
							
							
							
						 
						
							2017-05-08 19:11:47 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f602ec30cc  
						 
						
							
							
								
								
								Shared links create now a better HTML  
							
							 
							
							
							
						 
						
							2017-05-08 18:11:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	722e03cc58  
						 
						
							
							
								
								
								Added documentation  
							
							 
							
							
							
						 
						
							2017-05-08 17:29:46 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	aa4eafc304  
						 
						
							
							
								
								
								Even better?  
							
							 
							
							
							
						 
						
							2017-05-08 14:31:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5abef34284  
						 
						
							
							
								
								
								Should work now ...  
							
							 
							
							
							
						 
						
							2017-05-08 14:02:32 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3f975f6751  
						 
						
							
							
								
								
								More URL can be styled  
							
							 
							
							
							
						 
						
							2017-05-08 12:35:44 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	2002fc8a2a  
						 
						
							
							
								
								
								Better design for links in Mastodon posts  
							
							 
							
							
							
						 
						
							2017-05-08 12:18:30 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	20043914e6  
						 
						
							
							
								
								
								Move App to src  
							
							 
							
							... 
							
							
							
							- Add `use Friendica\App;` wherever needed 
							
						 
						
							2017-05-02 22:59:36 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	56ee734b00  
						 
						
							
							
								
								
								Cleanup /format pre-move  
							
							 
							
							
							
						 
						
							2017-05-02 22:59:24 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3592f90910  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1704-mastodon  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/bbcode.php 
							
						 
						
							2017-04-20 05:44:31 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e16fb74b0c  
						 
						
							
							
								
								
								Reworked OStatus communication part to better support Mastodon.  
							
							 
							
							
							
						 
						
							2017-04-19 21:37:00 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	a8136898b4 
 
						 
						
							
							
								
								
								Opps, fixed parser errors  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-14 17:04:09 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	3a197833cd 
 
						 
						
							
							
								
								
								added space  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-14 15:28:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	753b432ab2 
 
						 
						
							
							
								
								
								fixed intending  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-14 15:27:45 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	83d6d68efd 
 
						 
						
							
							
								
								
								removed some parentheses, but left them in where a string was concated  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-14 15:25:12 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	3051d30c88 
 
						 
						
							
							
								
								
								added spaces (CR)  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-08 19:40:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	215cae204d 
 
						 
						
							
							
								
								
								again develop and this branch differs ... (no blame on cherry-picking though)  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-08 19:38:40 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	d94e878714 
 
						 
						
							
							
								
								
								opps, was somehow missed to cherry-pick/merge ?  
							
							 
							
							... 
							
							
							
							+ converted multiple single-line comments into one multi-line comment
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-08 19:36:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	8ba461db0a 
 
						 
						
							
							
								
								
								removed spaces ...  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-08 19:17:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	78b9cf97e0 
 
						 
						
							
							
								
								
								huh? was in develop branch but not here?  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-08 19:12:31 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	3d386daf53 
 
						 
						
							
							
								
								
								no spaces here ...  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-08 19:11:51 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roland Häder 
								
							 
						 
						
							
							
								
							
							
	3d1626781d  
						 
						
							
							
								
								
								Merge branch 'develop' into rewrites/coding-convention-split2-1-2  
							
							 
							
							
							
						 
						
							2017-04-08 18:45:59 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	20f8b63fca 
 
						 
						
							
							
								
								
								unspaced ... ;-)  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-05 22:45:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	32ffe4a711 
 
						 
						
							
							
								
								
								more spaces/curly braces added  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-05 22:40:09 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	a4773a1ac0 
 
						 
						
							
							
								
								
								added more spaces + fixed tpzo: occurence  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-05 22:34:35 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	03571f6e74 
 
						 
						
							
							
								
								
								added spaces + some curly braces + some usage of dbm::is_result()  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-04 19:46:56 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	7b352f3f74  
						 
						
							
							
								
								
								Revert "Coding convention applied - part 1"  
							
							 
							
							
							
						 
						
							2017-03-21 12:02:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	951006dd10 
 
						 
						
							
							
								
								
								more spaces + some curly spaces added  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:51:54 +01:00