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 
								
							 
						 
						
							
							
								
							
							
	4ca68c7af0  
						 
						
							
							
								
								
								Class file relocations  
							
							 
							
							... 
							
							
							
							Issue #3878  
							
						 
						
							2017-11-08 08:37:03 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Magness 
								
							 
						 
						
							
							
								
							
							
	6189f6c8e7  
						 
						
							
							
								
								
								Relocate class files from /include to /src/  
							
							 
							
							... 
							
							
							
							dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated. 
							
						 
						
							2017-11-08 08:36:48 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Magness 
								
							 
						 
						
							
							
								
							
							
	0dfa57948f  
						 
						
							
							
								
								
								Issue-#3873  
							
							 
							
							... 
							
							
							
							Replace deprecated functions with new syntax. 
							
						 
						
							2017-11-07 06:24:39 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	a5d8d1fd77 
 
						 
						
							
							
								
								
								Update display.php  
							
							 
							
							... 
							
							
							
							adding baseurl to image tags for twitter and open Graph 
							
						 
						
							2017-10-31 02:45:58 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4744d6bf84  
						 
						
							
							
								
								
								we now provide a feed for the conversation  
							
							 
							
							
							
						 
						
							2017-10-18 06:25:22 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5acdd18c00  
						 
						
							
							
								
								
								Improve the data generation for the display page  
							
							 
							
							
							
						 
						
							2017-10-12 19:54:49 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b79c3241c6  
						 
						
							
							
								
								
								Directly serve atom+xml if requested  
							
							 
							
							
							
						 
						
							2017-09-19 11:53:19 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4b403e4fe2  
						 
						
							
							
								
								
								OStatus: Reworked import  
							
							 
							
							
							
						 
						
							2017-09-10 07:21:23 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	5f33f28b9e  
						 
						
							
							
								
								
								Display hadn't shown public items that weren't known to the user  
							
							 
							
							
							
						 
						
							2017-08-30 20:20:01 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0ac725dc47  
						 
						
							
							
								
								
								Some more updated queries  
							
							 
							
							
							
						 
						
							2017-08-12 22:15:16 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	41a81624a2  
						 
						
							
							
								
								
								Now deletions will also work with complicated queries  
							
							 
							
							
							
						 
						
							2017-08-12 18:07:47 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	1d8c91c478  
						 
						
							
							
								
								
								Restructured "dba::exists" function  
							
							 
							
							
							
						 
						
							2017-08-12 08:55:50 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d352a290fe  
						 
						
							
							
								
								
								Parameter wasn't replaced  
							
							 
							
							
							
						 
						
							2017-08-11 08:55:07 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d810b21f87  
						 
						
							
							
								
								
								New dba functions  
							
							 
							
							
							
						 
						
							2017-08-11 08:04:01 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fce72cbbc8  
						 
						
							
							
								
								
								Modifed "update" and "insert" function / many changed queries  
							
							 
							
							
							
						 
						
							2017-08-09 21:12:41 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	cf179188b6  
						 
						
							
							
								
								
								Some more worker fine tuning  
							
							 
							
							
							
						 
						
							2017-06-17 13:58:18 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	1838024f6d  
						 
						
							
							
								
								
								Merge pull request  #3528  from Hypolite/task/replace-explicit-php-logical-operators  
							
							 
							
							... 
							
							
							
							Replace explicit php logical operators 
							
						 
						
							2017-06-09 07:44:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9c0d2c31e8  
						 
						
							
							
								
								
								Replace AND and OR in PHP conditions by && and ||  
							
							 
							
							
							
						 
						
							2017-06-07 22:00:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	97fd47c614  
						 
						
							
							
								
								
								Moved include to top  
							
							 
							
							
							
						 
						
							2017-06-07 08:46:38 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6e6941a546  
						 
						
							
							
								
								
								We have an alternate link  
							
							 
							
							
							
						 
						
							2017-06-06 21:56:25 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	932e14971f  
						 
						
							
							
								
								
								Issue 2864: Add a "alternate" link on display page  
							
							 
							
							
							
						 
						
							2017-06-06 17:56:22 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	6d01dd83fe  
						 
						
							
							
								
								
								Bugfix: fix the author image in the meta elements in html head (display module)  
							
							 
							
							
							
						 
						
							2017-01-30 15:23:44 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	4c8de5fcfd  
						 
						
							
							
								
								
								limit the description of the meta tag to 160 characters in /mod/display  
							
							 
							
							
							
						 
						
							2017-01-25 13:10:42 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	8a197055e3  
						 
						
							
							
								
								
								Normalize App parameter declaration (mod folder, 1 out of 3)  
							
							 
							
							
							
						 
						
							2017-01-09 23:12:54 +11: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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	561f45b83b  
						 
						
							
							
								
								
								And again ...  
							
							 
							
							
							
						 
						
							2016-10-22 10:33:18 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b429b85680  
						 
						
							
							
								
								
								CSR changes, split dbclean in separate processes if worker is active  
							
							 
							
							
							
						 
						
							2016-10-22 10:14:41 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	501c45def5  
						 
						
							
							
								
								
								Some more improved queries  
							
							 
							
							
							
						 
						
							2016-10-21 18:25:21 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	fd2d8cc180  
						 
						
							
							
								
								
								Orphans are removed without giant lock problems  
							
							 
							
							
							
						 
						
							2016-10-20 22:05:21 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	493d7bc698  
						 
						
							
							
								
								
								Remove orphaned data  
							
							 
							
							
							
						 
						
							2016-10-19 21:06:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	3e5cf5290e  
						 
						
							
							
								
								
								Improved queries, more uncommitted queries  
							
							 
							
							
							
						 
						
							2016-10-17 18:38:51 +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 
								
							 
						 
						
							
							
								
							
							
	e512a83ecc  
						 
						
							
							
								
								
								Massively updated avatar handling  
							
							 
							
							
							
						 
						
							2016-06-19 01:07:20 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c05898c57d  
						 
						
							
							
								
								
								The queries for items are unified (a little bit)  
							
							 
							
							
							
						 
						
							2016-06-12 21:04:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	4b640dbd97  
						 
						
							
							
								
								
								Fetching of profile data improved  
							
							 
							
							
							
						 
						
							2016-06-05 21:17:55 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	
	
	c69aab6ee0 
 
						 
						
							
							
								
								
								Avoid write operations if not needed  
							
							 
							
							
							
						 
						
							2016-05-01 13:48:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	
	
	7a0edc86ae 
 
						 
						
							
							
								
								
								The display contained bad sql queries  
							
							 
							
							
							
						 
						
							2016-05-01 13:46:08 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b677f63e85  
						 
						
							
							
								
								
								Added some more explanation/now copy the whole thread  
							
							 
							
							
							
						 
						
							2016-05-01 09:48:05 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	5fc1eebdab  
						 
						
							
							
								
								
								Copy an item to the local user if it's only available as public copy  
							
							 
							
							
							
						 
						
							2016-05-01 00:19:24 +02:00