c636b0a6b2  
						 
						
							
							
								
								
								We can now unfollow a contact without deleting it  
							
							
							
						 
						
							2017-09-12 06:08:24 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	36e515ee6d  
						 
						
							
							
								
								
								Move Probe to src  
							
							
							
						 
						
							2017-05-07 14:44:30 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	82b423c5ac  
						 
						
							
							
								
								
								Fix require_once format  
							
							
							
						 
						
							2017-05-07 14:40:23 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	20043914e6  
						 
						
							
							
								
								
								Move App to src  
							
							... 
							
							
							
							- Add `use Friendica\App;` wherever needed 
							
						 
						
							2017-05-02 22:59:36 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Roland Häder 
								
							 
						 
						
							
							
								
							
							
	49527b70d3  
						 
						
							
							
								
								
								Merge branch 'develop' into rewrites/coding-convention-split2  
							
							
							
						 
						
							2017-04-01 22:16:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f6d7ee2781  
						 
						
							
							
								
								
								Issue 3142: mcrypt is no more (as well as phpseclib)  
							
							
							
						 
						
							2017-04-01 08:28:42 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	830af774d3 
 
						 
						
							
							
								
								
								added more curly braces + a bit more usage of dbm::is_result()  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-21 21:50:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	7b352f3f74  
						 
						
							
							
								
								
								Revert "Coding convention applied - part 1"  
							
							
							
						 
						
							2017-03-21 12:02:59 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	0cd241bcbe 
 
						 
						
							
							
								
								
								added spaces + some curly braces + some usage of dbm::is_result()  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:44:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	3849e7c9ff 
 
						 
						
							
							
								
								
								added more curly braces + a bit more usage of dbm::is_result()  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:40:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	53393233c3  
						 
						
							
							
								
								
								Replace the direct access of config variables  
							
							
							
						 
						
							2017-01-17 19:21:46 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	8a197055e3  
						 
						
							
							
								
								
								Normalize App parameter declaration (mod folder, 1 out of 3)  
							
							
							
						 
						
							2017-01-09 23:12:54 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	20e71d21a6  
						 
						
							
							
								
								
								Merge branch 'rewrites/app_get_baseurl_static' into develop  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php 
							
						 
						
							2016-12-22 11:37:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ad20c5504d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/diaspora.php
	object/Item.php 
							
						 
						
							2016-12-22 11:33:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c0df692f5f  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/diaspora.php
	object/Item.php 
							
						 
						
							2016-12-22 11:29:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	e8e1f9253d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links  
							
							... 
							
							
							
							# Conflicts:
#	include/follow.php 
							
						 
						
							2016-12-20 12:50:36 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	4a7c3b9eef  
						 
						
							
							
								
								
								Diaspora: Fix class name case + add self  
							
							
							
						 
						
							2016-12-20 12:44:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	de689583e2  
						 
						
							
							
								
								
								added more curly braces + space between "if" and brace  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	mod/admin.php 
							
						 
						
							2016-12-20 17:58:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4b221d216e  
						 
						
							
							
								
								
								added more curly braces + space between "if" and brace  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 17:57:40 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4805aa8fdb  
						 
						
							
							
								
								
								Don't cherry-pick:  
							
							... 
							
							
							
							- reverted dbm::is_result() to count()
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 16:28:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	51716957b2  
						 
						
							
							
								
								
								converted more to dbm::is_result() + added braces/space  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 15:37:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	65e1cd728c  
						 
						
							
							
								
								
								Coding convention:  
							
							... 
							
							
							
							- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 10:40:09 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a5e4882e25  
						 
						
							
							
								
								
								Coding convention:  
							
							... 
							
							
							
							- added curly braces
- added space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 10:35:28 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	abff6372dd  
						 
						
							
							
								
								
								Coding convention applied:  
							
							... 
							
							
							
							- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/lock.php 
							
						 
						
							2016-12-20 10:12:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fb676335db  
						 
						
							
							
								
								
								Coding convention applied:  
							
							... 
							
							
							
							- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 10:10:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	884f44ce94  
						 
						
							
							
								
								
								*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-19 14:27:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c75d6ad850  
						 
						
							
							
								
								
								More dbm::is_result() instead of count()  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-14 12:03:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	46d383369c  
						 
						
							
							
								
								
								Cleanup for  #3010  - added spaces, thanks to @annando .  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-14 09:41:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6a8a36f12d  
						 
						
							
							
								
								
								More usage of dbm::is_result($r) instead of count($r):  
							
							... 
							
							
							
							- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-13 10:44:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	ac39928e5d  
						 
						
							
							
								
								
								upload connection graphics & update doxygen headers to insert link to the spec  
							
							
							
						 
						
							2016-11-28 16:23:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	668da905e2  
						 
						
							
							
								
								
								"proc_run" is now called with priority.  
							
							
							
						 
						
							2016-08-01 07:48:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	f27bc00464  
						 
						
							
							
								
								
								Remove obsolote functions  
							
							
							
						 
						
							2016-07-09 20:09:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d6a79abb68  
						 
						
							
							
								
								
								Bugfix: "default_group" behaviour wasn't implemented correctly  
							
							
							
						 
						
							2016-04-13 22:21:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	206c26ae30  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1602-diaspora  
							
							
							
						 
						
							2016-03-21 06:47:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8f00836ffb  
						 
						
							
							
								
								
								Add the guid to items that we create locally  
							
							
							
						 
						
							2016-03-20 15:01:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	56cb6cc897  
						 
						
							
							
								
								
								Removed just more old diaspora function calls.  
							
							
							
						 
						
							2016-03-14 20:53:44 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8752ec11b2  
						 
						
							
							
								
								
								Central function for default group, special setting for OStatus  
							
							
							
						 
						
							2016-03-06 13:15:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	b202e02fbf  
						 
						
							
							
								
								
								Revert "Updated modules to allow for partial overrides without errors"  
							
							... 
							
							
							
							This reverts commit db949bb802 
							
						 
						
							2016-02-07 15:11:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrej Stieben 
								
							 
						 
						
							
							
								
							
							
	db949bb802  
						 
						
							
							
								
								
								Updated modules to allow for partial overrides without errors  
							
							... 
							
							
							
							Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions. 
							
						 
						
							2016-02-05 21:52:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	78e79de7c9  
						 
						
							
							
								
								
								New central function to store avatar data in contacts  
							
							
							
						 
						
							2016-01-28 11:09:08 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6f662b8c74  
						 
						
							
							
								
								
								New avatar picture fields to better cope with changing avatars  
							
							
							
						 
						
							2016-01-28 01:26:19 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ab0fbc3a65  
						 
						
							
							
								
								
								Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers  
							
							
							
						 
						
							2015-10-10 04:56:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0e895e24f7  
						 
						
							
							
								
								
								Code reworks: replaced hardcoded network text with the corresponding constants.  
							
							
							
						 
						
							2015-04-11 22:14:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	1bdddebd44  
						 
						
							
							
								
								
								connection confirm notification mail via notification()  
							
							... 
							
							
							
							remove unused email templates
add a check for unexpected reponse from server 
							
						 
						
							2014-09-06 17:28:46 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6e7bd68ebb  
						 
						
							
							
								
								
								More "LIMIT 1" removed - and some other SQL improvements.  
							
							
							
						 
						
							2014-03-11 23:52:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	bce29054b9  
						 
						
							
							
								
								
								allow Smarty use on international templates  
							
							
							
						 
						
							2013-01-10 21:46:48 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	4ab363ed71  
						 
						
							
							
								
								
								bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.)  
							
							
							
						 
						
							2013-01-07 20:14:00 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	07ba4da634  
						 
						
							
							
								
								
								email header encoding everywhere  
							
							
							
						 
						
							2013-01-04 15:47:29 -08:00