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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ca2454eeb4  
						 
						
							
							
								
								
								Avoid write operations if not needed  
							
							
							
						 
						
							2016-04-23 00:06:34 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	99d5f8afc6  
						 
						
							
							
								
								
								The display contained bad sql queries  
							
							
							
						 
						
							2016-03-13 13:04:12 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	99bac3a4d8  
						 
						
							
							
								
								
								Corrected explanation  
							
							
							
						 
						
							2016-02-24 07:22:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	eec0dbf738  
						 
						
							
							
								
								
								Bugfix: Resharing on the display page works again.  
							
							
							
						 
						
							2016-02-24 07:20:23 +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 
								
							 
						 
						
							
							
								
							
							
	596416defe  
						 
						
							
							
								
								
								Profile data from the gcontact should only be taken if there is content  
							
							
							
						 
						
							2016-01-29 12:14:04 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8b90e5c077  
						 
						
							
							
								
								
								Removed unused functionality  
							
							
							
						 
						
							2016-01-16 14:46:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6b85fa17bb  
						 
						
							
							
								
								
								Added some documentation  
							
							
							
						 
						
							2016-01-10 19:06:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	23731fc9aa  
						 
						
							
							
								
								
								Bugfix: The display hadn't fetched the correct contact for the uid.  
							
							
							
						 
						
							2016-01-10 15:44:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	885dc1df81  
						 
						
							
							
								
								
								gcontact update script, rebuilt follow page, query speedup for community and network groups  
							
							
							
						 
						
							2016-01-10 09:19:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6703ba468a  
						 
						
							
							
								
								
								Profile data in gcontact overwrites profile data  
							
							
							
						 
						
							2016-01-08 08:02:42 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	9521cdc18f  
						 
						
							
							
								
								
								notify and alias are now in gcontact as well - the contact expansion in mod/item.php is renewed  
							
							
							
						 
						
							2016-01-07 23:43:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	5ab2786c00  
						 
						
							
							
								
								
								Get rid of the table "unique_contacts"  
							
							
							
						 
						
							2016-01-06 22:23:12 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d077dbbcde  
						 
						
							
							
								
								
								Bugfix: The bbcode conversion of the profile was inconsistent  
							
							
							
						 
						
							2015-12-14 23:53:35 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	1f0b759e2f  
						 
						
							
							
								
								
								Added resize possibility to proxy function  
							
							
							
						 
						
							2015-10-07 08:25:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	14e17b944f  
						 
						
							
							
								
								
								Reworked fetching of contact data on "display" page  
							
							
							
						 
						
							2015-10-06 18:31:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7ed61b2edc  
						 
						
							
							
								
								
								Removed "proxy_parse_html" since it is now done in the bbcode function.  
							
							
							
						 
						
							2015-10-05 22:25:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	e94e6d7500  
						 
						
							
							
								
								
								escape user data to sql  
							
							
							
						 
						
							2015-08-06 16:08:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	e5809dce79  
						 
						
							
							
								
								
								add jotnets for sharing posts  
							
							
							
						 
						
							2015-07-12 17:52:25 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	8cca849c2e  
						 
						
							
							
								
								
								Merge acl-var into develop  
							
							... 
							
							
							
							Conflicts:
	mod/settings.php 
							
						 
						
							2015-06-27 15:23:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	5ce125d6e0  
						 
						
							
							
								
								
								cleanup of some unused code  
							
							
							
						 
						
							2015-06-26 15:13:52 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	df7b907bc4  
						 
						
							
							
								
								
								Display: Look for the network name when fetching the contact (important because of the statusnet connector)  
							
							
							
						 
						
							2015-06-21 01:34:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	ccbac6874b  
						 
						
							
							
								
								
								The "connect" link ar the display page now directs to the new "follow" page as well.  
							
							
							
						 
						
							2015-04-09 07:45:48 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e02b982f77  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage  
							
							
							
						 
						
							2015-02-01 13:28:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e3da549ab5  
						 
						
							
							
								
								
								Reshared diaspora items that aren't on this server are now stored with uid=0  
							
							
							
						 
						
							2015-02-01 10:26:35 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	036ccf84de  
						 
						
							
							
								
								
								And yet another two places where pictures have to be sent through the proxy.  
							
							
							
						 
						
							2015-01-28 23:34:46 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	46db8575a0  
						 
						
							
							
								
								
								The table "unique_contacts" now has an "about" and "location" field as well.  
							
							
							
						 
						
							2015-01-08 01:32:19 +01:00