rabuzarus 
								
							 
						 
						
							
							
								
							
							
	3474b40732  
						 
						
							
							
								
								
								fix - pending contacts shouldn't be shown in contacts widgit and viewcontacts  
							
							
							
						 
						
							2017-02-10 03:51:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	53393233c3  
						 
						
							
							
								
								
								Replace the direct access of config variables  
							
							
							
						 
						
							2017-01-17 19:21:46 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0c310db23d  
						 
						
							
							
								
								
								Bugfix for failed events page and api  
							
							
							
						 
						
							2017-01-16 20:59:16 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	87eb3d5ef2  
						 
						
							
							
								
								
								Normalize App parameter declaration (doc-include folders, boot)  
							
							
							
						 
						
							2017-01-09 23:09:01 +11: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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	af2909bf8f 
 
						 
						
							
							
								
								
								Continued with coding convention:  
							
							... 
							
							
							
							- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-12-20 21:13:50 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fb0ed18a43  
						 
						
							
							
								
								
								changed to this:  
							
							... 
							
							
							
							---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 10:58:03 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a96eb3428d  
						 
						
							
							
								
								
								Used more dbm::is_result() instead of (!$r) or (!count($r)), still there are  
							
							... 
							
							
							
							more pending ...
Also put SQL table columns into back-ticks.
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-19 14:46:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ba3bc420ca  
						 
						
							
							
								
								
								Also reverted these + added spaces for nicer appearance.  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-15 09:23:59 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6cef88c24e  
						 
						
							
							
								
								
								Also reverted these + added spaces for nicer appearance.  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-15 09:23:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	41db906dc4  
						 
						
							
							
								
								
								Continued with  #3010 :  
							
							... 
							
							
							
							- removed added debug messages (maybe they will come back in accordance to
  code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
  (substr($url, 0, 4) !== 'http') on $url = 'https://bla '; will be FALSE
  (means found http at start), too.
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-14 17:02:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	23d4db5149  
						 
						
							
							
								
								
								Continued with  #3010 :  
							
							... 
							
							
							
							- removed added debug messages (maybe they will come back in accordance to
  code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
  (substr($url, 0, 4) !== 'http') on $url = 'https://bla '; will be FALSE
  (means found http at start), too.
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-14 16:59:35 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a905522eb5  
						 
						
							
							
								
								
								Cleanup for  #3010  - added spaces, thanks to @annando .  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-14 09:42:36 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	63610c7b73  
						 
						
							
							
								
								
								Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php 
							
						 
						
							2016-12-13 11:00:44 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	293436e5fd  
						 
						
							
							
								
								
								Some rewrites:  
							
							... 
							
							
							
							- max_proccesses_reach() and maxload_reached() (why no _ behind max?) are called
  both way, static and with object reference.
- this is strongly discouraged and should be avoided as its support (in PHP) may
  be dropped in future releases.
- used $a = get_app(); to encapsulate code (even when the function does
  currently the same, it may be changed later)
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-13 10:16:36 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b2302f6290  
						 
						
							
							
								
								
								Maybe we shouldn't count pending contacts  
							
							
							
						 
						
							2016-11-29 18:23:34 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3a76a6766f  
						 
						
							
							
								
								
								Issue 2772: Pending contacts should now be displayed  
							
							
							
						 
						
							2016-11-28 22:11:13 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4eeb5a0a17  
						 
						
							
							
								
								
								Merge pull request  #2969  from gerhard6380/develop  
							
							... 
							
							
							
							Develop 
							
						 
						
							2016-11-23 05:13:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	3de862712d  
						 
						
							
							
								
								
								Issue 2772: Posts from pending contacts should be displayed as well.  
							
							
							
						 
						
							2016-11-20 16:52:57 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e6148f4c1c  
						 
						
							
							
								
								
								Performance improvements when storing items (via API)  
							
							
							
						 
						
							2016-11-12 13:17:28 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	623d809cc3  
						 
						
							
							
								
								
								changes in api call for showing profiles and disable proxy for images in html code for api calls  
							
							
							
						 
						
							2016-11-09 21:35:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	37985a0d3f  
						 
						
							
							
								
								
								Use "micro"  
							
							
							
						 
						
							2016-11-04 22:56:50 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fbfaef1968  
						 
						
							
							
								
								
								API calls should be much faster than before  
							
							
							
						 
						
							2016-11-04 22:45:20 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	deb2fee2f0  
						 
						
							
							
								
								
								pconfig: Improved behaviour with already stored values  
							
							
							
						 
						
							2016-10-23 07:49:21 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	501c45def5  
						 
						
							
							
								
								
								Some more improved queries  
							
							
							
						 
						
							2016-10-21 18:25:21 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	6c3c3a64ae  
						 
						
							
							
								
								
								remove parameter from doxygen description  
							
							
							
						 
						
							2016-09-25 22:25:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	0e8a9f93d7  
						 
						
							
							
								
								
								another correction of spaces  
							
							
							
						 
						
							2016-09-25 18:52:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	0581cbcfc8  
						 
						
							
							
								
								
								change spaces/tabstopps  
							
							
							
						 
						
							2016-09-25 18:50:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	5e1726184a  
						 
						
							
							
								
								
								correct some spaces/tabs  
							
							
							
						 
						
							2016-09-25 18:45:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	01ff105a43  
						 
						
							
							
								
								
								correct tab indents and CRLF  
							
							
							
						 
						
							2016-09-25 18:22:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	afc7d316a7  
						 
						
							
							
								
								
								Change API documentation to contain new API call /api/friendica/profile/show  
							
							
							
						 
						
							2016-09-23 19:26:44 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	4de12dacc7  
						 
						
							
							
								
								
								New API /api/friendica/profile/show to return data of all profiles a user has to a client  
							
							
							
						 
						
							2016-09-23 19:06:41 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	636164e9ef 
 
						 
						
							
							
								
								
								Opps, wrong brace and removed invert of dbm::is_result()  
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-09-18 23:31:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	c825cc8d0d 
 
						 
						
							
							
								
								
								This merge brings back dbm::is_result() where I could find it.  
							
							... 
							
							
							
							Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-09-18 23:21:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	3a31619509  
						 
						
							
							
								
								
								API: change friendica_activities to include arrays of users  
							
							
							
						 
						
							2016-09-02 17:01:52 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	078767630c  
						 
						
							
							
								
								
								improved sql statements for direct_messages calls  
							
							
							
						 
						
							2016-08-14 22:03:59 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	01a2eb3555  
						 
						
							
							
								
								
								Implement api/direct_messages/destroy  
							
							... 
							
							
							
							Twitter compliant call replaces api/friendica/direct_messages_delete;
JSON return expected by Twitter API and parameter include_entities not
yet implemented 
							
						 
						
							2016-08-14 22:03:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	ef0cc850d4  
						 
						
							
							
								
								
								remove api_friendica_direct_messages_all  
							
							... 
							
							
							
							instead included 'friendica_verbose' parameter into standard function
api_direct_messages_box() 
							
						 
						
							2016-08-14 22:03:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	f9f1825e33  
						 
						
							
							
								
								
								Removing api_friendica_direct_messages_conversations  
							
							... 
							
							
							
							due to implementing 'seen' and 'parent-uri' into standard
api_format_messages() this call is not needed anymore. Adapting comment
blocks. 
							
						 
						
							2016-08-14 22:03:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	f99a646328  
						 
						
							
							
								
								
								remove api_format_messages_win and include new fields in api_format_messages  
							
							
							
						 
						
							2016-08-14 22:02:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									gerhard6380 
								
							 
						 
						
							
							
								
							
							
	fe5182559f  
						 
						
							
							
								
								
								new API calls for private messsages in Win10 app  
							
							... 
							
							
							
							new API calls used for Windows 10 app (similar calls to existing but
extended to include seen id and parent-uri) 
							
						 
						
							2016-08-14 22:02:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	87fb0b7b26  
						 
						
							
							
								
								
								Quick fix to PR  #2682  
							
							
							
						 
						
							2016-08-02 12:24:07 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	747dc934f7  
						 
						
							
							
								
								
								Avoid warning because $a isn't called by reference  
							
							
							
						 
						
							2016-07-24 13:53:26 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8bf7db06db  
						 
						
							
							
								
								
								New indexes for the API  
							
							
							
						 
						
							2016-07-19 08:43:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4f07dfb35a  
						 
						
							
							
								
								
								Optimized queries  
							
							
							
						 
						
							2016-07-18 15:25:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	838f976715  
						 
						
							
							
								
								
								Some more improvements to xml.php, code cleanup  
							
							
							
						 
						
							2016-07-17 23:59:35 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d7f093cb2e  
						 
						
							
							
								
								
								Enhanced XML creation, and so on.  
							
							
							
						 
						
							2016-07-17 19:42:30 +02:00