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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	226bda9f58  
						 
						
							
							
								
								
								add missing info about if contact is forum to contact related pages  
							
							
							
						 
						
							2015-11-28 03:50:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0f41f35041  
						 
						
							
							
								
								
								The contact template now displays the address if available  
							
							
							
						 
						
							2015-11-06 00:47:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	7b1a957474  
						 
						
							
							
								
								
								template-rework: try to fix double entries at match.php  
							
							
							
						 
						
							2015-10-26 16:15:08 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	eaf5d05030  
						 
						
							
							
								
								
								template rework: display more infos for match and dirfind  
							
							
							
						 
						
							2015-10-23 16:48:32 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	0c3979720f  
						 
						
							
							
								
								
								template rework: rearrange sidebar widgets for contact related pages  
							
							
							
						 
						
							2015-10-23 00:12:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	f9c0c1d696  
						 
						
							
							
								
								
								template rework: use viewcontact_template.tpl for contact dealing pages  
							
							
							
						 
						
							2015-10-18 17:12:48 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	4b8ca578d1  
						 
						
							
							
								
								
								dirfind: move pagination into template  
							
							
							
						 
						
							2015-10-17 22:09:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	67f699403a  
						 
						
							
							
								
								
								match.php: restructure acdording to the change of match.tpl  
							
							
							
						 
						
							2015-10-17 00:39:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	1f0b759e2f  
						 
						
							
							
								
								
								Added resize possibility to proxy function  
							
							
							
						 
						
							2015-10-07 08:25:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	5ac38b7f99  
						 
						
							
							
								
								
								There is now only one central parameter for the global directory.  
							
							
							
						 
						
							2015-09-15 22:29:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	123ad84689  
						 
						
							
							
								
								
								Make the hardcoded path to dir.friendica.com configurable  
							
							
							
						 
						
							2015-08-23 11:05:10 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	74267310d6  
						 
						
							
							
								
								
								html to section_title.tpl  
							
							
							
						 
						
							2015-05-30 02:21:30 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	9244e8727d  
						 
						
							
							
								
								
								dbesc and normalise_link  
							
							
							
						 
						
							2015-05-10 09:10:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	0b8b1fdef3  
						 
						
							
							
								
								
								add procy_url around the profile images  
							
							
							
						 
						
							2015-05-06 16:14:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fd8c9a9dac  
						 
						
							
							
								
								
								avoid some contacts from profile match listing  
							
							
							
						 
						
							2015-05-06 13:02:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Kampmann 
								
							 
						 
						
							
							
								
							
							
	355c42cb30  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/friendica/friendica  
							
							... 
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 
						
							2012-04-05 13:39:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	d83bfd464b  
						 
						
							
							
								
								
								zrl into people searches  
							
							
							
						 
						
							2012-03-29 22:20:14 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Abinoam P. Marques Jr 
								
							 
						 
						
							
							
								
							
							
	9b2171ecee  
						 
						
							
							
								
								
								mod/match.php - Friendika -> Friendica  
							
							
							
						 
						
							2012-02-20 19:41:01 -03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	8aa2552372  
						 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)  
							
							
							
						 
						
							2012-01-18 16:21:30 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	eb05d00794  
						 
						
							
							
								
								
								connect on suggest/match - added to testbubble  
							
							
							
						 
						
							2011-12-18 12:51:45 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									friendica 
								
							 
						 
						
							
							
								
							
							
	5d6a098ce0  
						 
						
							
							
								
								
								add connect link to suggestion and matches  
							
							
							
						 
						
							2011-12-18 01:44:46 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	557a7d0cec  
						 
						
							
							
								
								
								stuff  
							
							... 
							
							
							
							- background the external network notifications (Facebook, Twitter, Statusnet)
 - add vimeo support
 - consolidate editor video options (insert video, regardless of source)
 - add "Connector Settings" page purely for configuring connectors
 - moved mailbox settings to Connectors
 - Move the "Connect/Follow" dialogue out of "find people" and move to top.
 - Add "Find People" dialogue
 - minor theme edits on duepuntozero and testbubble to make all this stuff work
 - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos. 
							
						 
						
							2011-10-11 18:24:37 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Devlon Duthie 
								
							 
						 
						
							
							
								
							
							
	f84c208ac5  
						 
						
							
							
								
								
								broke 'find similar' matches content into a tpl in core, added an extended tpl to testbubble that lists the profile tags  
							
							
							
						 
						
							2011-10-03 01:45:27 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	e795d1265e  
						 
						
							
							
								
								
								show keywords in match results  
							
							
							
						 
						
							2011-07-03 21:30:48 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	e6aaa8b59b  
						 
						
							
							
								
								
								use local 'match people with my interests' if global directory is not configured  
							
							
							
						 
						
							2011-07-02 01:21:56 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	de24f68112  
						 
						
							
							
								
								
								module to provide local "find people like me" when global dir unavailable  
							
							
							
						 
						
							2011-06-20 05:14:42 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	20d1de4ced  
						 
						
							
							
								
								
								got it wrong - apparently no need to fix json slashes  
							
							
							
						 
						
							2011-06-02 20:42:09 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	e1107b55c6  
						 
						
							
							
								
								
								add info() function. Works like notice() but show messages in a div with class info-message.  
							
							... 
							
							
							
							update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes 
							
						 
						
							2011-05-23 11:39:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	cd2a0802e4  
						 
						
							
							
								
								
								horizontal match layout  
							
							
							
						 
						
							2011-03-22 02:21:53 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	ee11a74d0b  
						 
						
							
							
								
								
								profile match  
							
							
							
						 
						
							2011-03-21 21:43:22 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	c74367e4c2  
						 
						
							
							
								
								
								pagination in keyword match  
							
							
							
						 
						
							2011-03-21 21:26:11 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	ee1dff9980  
						 
						
							
							
								
								
								converted json to symbolic references  
							
							
							
						 
						
							2011-03-21 19:44:00 -07:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Friendika 
								
							 
						 
						
							
							
								
							
							
	e16bca4f76  
						 
						
							
							
								
								
								first prototype of profile match against global directory (hint: set some keywords)  
							
							
							
						 
						
							2011-03-21 19:33:06 -07:00