8983dcaa77  
						 
						
							
							
								
								
								Improvements for following/unfollowing of Diaspora and OStatus  
							
							 
							
							
							
						 
						
							2017-09-23 14:48:27 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	016e4a0efc  
						 
						
							
							
								
								
								Show contacts personal message in local profile  
							
							 
							
							
							
						 
						
							2017-08-01 17:47:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9c0d2c31e8  
						 
						
							
							
								
								
								Replace AND and OR in PHP conditions by && and ||  
							
							 
							
							
							
						 
						
							2017-06-07 22:00:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	80103f8ad9  
						 
						
							
							
								
								
								Issue 3309: Avatar update should work now  
							
							 
							
							
							
						 
						
							2017-05-16 21:21:54 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	3a2988c3fd  
						 
						
							
							
								
								
								Rename include/Scrape to include/probe  
							
							 
							
							
							
						 
						
							2017-05-07 14:45:19 -04: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 
								
							 
						 
						
							
							
								
							
							
	86cae070f2  
						 
						
							
							
								
								
								Merge branch 'develop' into improvement/move-app-to-src-2  
							
							 
							
							
							
						 
						
							2017-05-07 12:58:11 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c52b2f392f  
						 
						
							
							
								
								
								Probing has to be done uncached  
							
							 
							
							
							
						 
						
							2017-05-07 16:33:54 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	4b16de6d80  
						 
						
							
							
								
								
								Fix wrong class name case  
							
							 
							
							... 
							
							
							
							- Use leading backslash for non-namespace class names in App 
							
						 
						
							2017-05-02 23:36:46 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	20043914e6  
						 
						
							
							
								
								
								Move App to src  
							
							 
							
							... 
							
							
							
							- Add `use Friendica\App;` wherever needed 
							
						 
						
							2017-05-02 22:59:36 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	7b352f3f74  
						 
						
							
							
								
								
								Revert "Coding convention applied - part 1"  
							
							 
							
							
							
						 
						
							2017-03-21 12:02:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	09851331a9 
 
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-03-20 20:51:32 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	132688d663  
						 
						
							
							
								
								
								Standards, what else?  
							
							 
							
							
							
						 
						
							2017-03-19 08:04:04 +00: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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	63e4750b4a 
 
						 
						
							
							
								
								
								more coding convention applied:  
							
							 
							
							... 
							
							
							
							- added curly braces
- added spaces where needed
- $r only needs to be tested with dbm::is_result()
- made SQL keywords all uper-case
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:40:21 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	1a436264cd  
						 
						
							
							
								
								
								Some standards  
							
							 
							
							
							
						 
						
							2017-03-18 12:13:43 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0afb0c2ea4  
						 
						
							
							
								
								
								NULL_DATE is now a constant  
							
							 
							
							
							
						 
						
							2017-02-27 23:37:15 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	66482c1d9c  
						 
						
							
							
								
								
								- Remove $theme_richtext_editor boot var  
							
							 
							
							... 
							
							
							
							- Remove "richtext" feature
- Remove fix_mce_lf() function
- Remove nomce parameter 
							
						 
						
							2017-01-26 22:57:53 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9d5384f107  
						 
						
							
							
								
								
								- Remove tinyMCE mentions or convert to addeditortext()  
							
							 
							
							... 
							
							
							
							- Remove $editselect template value 
							
						 
						
							2017-01-26 22:50:27 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	8a197055e3  
						 
						
							
							
								
								
								Normalize App parameter declaration (mod folder, 1 out of 3)  
							
							 
							
							
							
						 
						
							2017-01-09 23:12:54 +11:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	bc9cb5e5f6 
 
						 
						
							
							
								
								
								added curly braces + fixed indenting according to code review by Hypolite  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-12-30 21:48:09 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	9fad8109ff 
 
						 
						
							
							
								
								
								changed to this:  
							
							 
							
							... 
							
							
							
							---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-23 19:50:21 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	6e44acfed6 
 
						 
						
							
							
								
								
								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:15:53 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	e24c3a5b82  
						 
						
							
							
								
								
								added much more curly braces + space between "if" and brace  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 11:56:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4dce3d8224  
						 
						
							
							
								
								
								changed to this:  
							
							 
							
							... 
							
							
							
							---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 10:58:55 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6de232c60a  
						 
						
							
							
								
								
								Cleanup for  #3010  - removed all redundant lines found by @rabuzarus  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-14 09:31:27 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	126c4774c3  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1607-performance  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/dbstructure.php
	mod/item.php
	mod/nodeinfo.php 
							
						 
						
							2016-11-16 06:27:21 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4d966e1e21  
						 
						
							
							
								
								
								Changed priority for onepoll/further enhancement for dbclean  
							
							 
							
							
							
						 
						
							2016-10-31 21:32:08 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	60a0235af0  
						 
						
							
							
								
								
								The account type is now read and displayed  
							
							 
							
							
							
						 
						
							2016-10-01 20:03:27 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	196eb6009f  
						 
						
							
							
								
								
								The XMPP address is now in the profile and will be transmitted  
							
							 
							
							
							
						 
						
							2016-09-25 15:28:00 +00: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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	668da905e2  
						 
						
							
							
								
								
								"proc_run" is now called with priority.  
							
							 
							
							
							
						 
						
							2016-08-01 07:48:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4e02b80868  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1607-performance  
							
							 
							
							
							
						 
						
							2016-07-26 22:16:37 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4961fb3a45  
						 
						
							
							
								
								
								Unused indexes removed, queries changed  
							
							 
							
							
							
						 
						
							2016-07-26 22:10:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	18a35e9ceb  
						 
						
							
							
								
								
								Merge pull request  #2688  from rabuzarus/2607-drop  
							
							 
							
							... 
							
							
							
							frio: provide confirm modal 
							
						 
						
							2016-07-26 10:45:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	694637f9c3  
						 
						
							
							
								
								
								frio: provide confirm modal  
							
							 
							
							
							
						 
						
							2016-07-26 10:36:34 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	768d10536f  
						 
						
							
							
								
								
								frio: templates for contact_edit and crepair  
							
							 
							
							
							
						 
						
							2016-07-26 09:09:40 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	073f520cee  
						 
						
							
							
								
								
								add missing strings for frio  
							
							 
							
							
							
						 
						
							2016-06-25 12:21:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	ca269b6329  
						 
						
							
							
								
								
								unify heading of search results to "results for:"  
							
							 
							
							
							
						 
						
							2016-06-11 10:44:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	3e701b90ac 
 
						 
						
							
							
								
								
								Continued rewriting:  
							
							 
							
							... 
							
							
							
							- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-05-01 14:24:44 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	b93326bb23  
						 
						
							
							
								
								
								contactedit-actions-button: use internal links instead of full links  
							
							 
							
							
							
						 
						
							2016-02-23 19:26:03 +01:00