friendica 
								
							 
						 
						
							
							
								
							
							
	7d8b087f4a  
						 
						
							
							
								
								
								fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them.  
							
							 
							
							
							
						 
						
							2012-06-13 19:59:20 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	832d9eeaaf  
						 
						
							
							
								
								
								more fixes  
							
							 
							
							
							
						 
						
							2012-06-12 16:17:34 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	24e85c95b6  
						 
						
							
							
								
								
								date based profile wall filter - backend  
							
							 
							
							
							
						 
						
							2012-06-11 19:36:04 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	4978ee12d1  
						 
						
							
							
								
								
								webfinger profile linker  
							
							 
							
							
							
						 
						
							2012-06-02 18:05:23 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	15c023a218  
						 
						
							
							
								
								
								y didn't i think of this b4?  
							
							 
							
							
							
						 
						
							2012-05-30 17:22:51 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	789063da39  
						 
						
							
							
								
								
								add a placeholder attribute on search-text; dispy fixes  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-05-23 15:58:22 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	a163825291  
						 
						
							
							
								
								
								redir links for permission controlled attachments  
							
							 
							
							
							
						 
						
							2012-05-21 22:54:39 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	70a07086ad  
						 
						
							
							
								
								
								slight improvement in a couple of queries  
							
							 
							
							
							
						 
						
							2012-05-08 22:46:40 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	d0dd22af57  
						 
						
							
							
								
								
								workaround to clean up orphaned filetags  
							
							 
							
							
							
						 
						
							2012-05-04 17:43:47 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	7c6e8b30b2  
						 
						
							
							
								
								
								only show remove category to item owner  
							
							 
							
							
							
						 
						
							2012-05-04 16:45:10 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	10754ced3e  
						 
						
							
							
								
								
								category removal  
							
							 
							
							
							
						 
						
							2012-05-04 06:42:56 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	26c53580d1  
						 
						
							
							
								
								
								implement contact archival  
							
							 
							
							
							
						 
						
							2012-04-27 17:17:58 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	4496d075e5  
						 
						
							
							
								
								
								move html out of lang_selector() and new template lang_selector.tpl  
							
							 
							
							
							
						 
						
							2012-04-13 11:56:21 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	9b1bb53234  
						 
						
							
							
								
								
								fix_mce_lf on profiles  
							
							 
							
							
							
						 
						
							2012-04-10 16:31:49 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	3a1c78bd75  
						 
						
							
							
								
								
								some work on tests  
							
							 
							
							
							
						 
						
							2012-04-07 01:04:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	221726392e  
						 
						
							
							
								
								
								pass autoname(0) test  
							
							 
							
							
							
						 
						
							2012-04-05 18:44:36 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	62e528ba43  
						 
						
							
							
								
								
								remove zrl from query string  
							
							 
							
							
							
						 
						
							2012-04-02 00:45:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	1f74bd1b78  
						 
						
							
							
								
								
								catch a couple more Oo smilies  
							
							 
							
							
							
						 
						
							2012-04-01 22:57:50 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Johnston 
								
							 
						 
						
							
							
								
							
							
	581b54c974  
						 
						
							
							
								
								
								allow users to set categories on their posts  
							
							 
							
							
							
						 
						
							2012-04-01 21:28:31 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	53f799f2bc  
						 
						
							
							
								
								
								handle escaped file chars in display and search  
							
							 
							
							
							
						 
						
							2012-03-31 15:25:17 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	0cf2e051bb  
						 
						
							
							
								
								
								escape % in file_tag_query as it is ultimately embedded in a sprintf  
							
							 
							
							
							
						 
						
							2012-03-31 14:48:35 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	8c928e67ba  
						 
						
							
							
								
								
								warning cleanup  
							
							 
							
							
							
						 
						
							2012-03-30 23:18:46 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	bb8beb26b4  
						 
						
							
							
								
								
								use zrl to get home again  
							
							 
							
							
							
						 
						
							2012-03-29 20:58:32 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	bdd2754740  
						 
						
							
							
								
								
								Merge commit 'upstream/master'  
							
							 
							
							
							
						 
						
							2012-03-28 19:52:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	7aec2fd68d  
						 
						
							
							
								
								
								filer: info() on item filed  
							
							 
							
							
							
						 
						
							2012-03-28 10:45:16 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	528d795fb6  
						 
						
							
							
								
								
								ability to change tags in edited posts  
							
							 
							
							
							
						 
						
							2012-03-22 16:17:10 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	d81256d7b0  
						 
						
							
							
								
								
								support lowercase :-p smilie  
							
							 
							
							
							
						 
						
							2012-03-21 21:45:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
								
							
							
	84f8e2eaa8  
						 
						
							
							
								
								
								modified:   include/text.php  
							
							 
							
							... 
							
							
							
							Stupid bug fixed 
							
						 
						
							2012-03-19 22:32:19 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
								
							
							
	e9b33a6f1f  
						 
						
							
							
								
								
								modified:   include/text.php  
							
							 
							
							... 
							
							
							
							deleted:    images/diaspora.png
	deleted:    images/smiley-bangheaddesk.gif
	deleted:    images/smiley-beard.png
	deleted:    images/smiley-shaka.gif
	deleted:    images/smiley-whitebeard.png
Removed selected smiley per Mike's request.  Also removed deprecated smileys that were just commented out. 
							
						 
						
							2012-03-19 21:59:06 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	139a86dbd3  
						 
						
							
							
								
								
								some openid fixes, use identity url from openid server and normalise it.  
							
							 
							
							
							
						 
						
							2012-03-19 06:48:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	2349852b4a  
						 
						
							
							
								
								
								support "no_smilies"  
							
							 
							
							
							
						 
						
							2012-03-19 03:18:39 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	67fd539f53  
						 
						
							
							
								
								
								bug  #337 , call template_unescape() only at the end of template processing  
							
							 
							
							
							
						 
						
							2012-03-17 18:15:36 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	f5db142d93  
						 
						
							
							
								
								
								Quotes with author are now having an "open/close" link  
							
							 
							
							
							
						 
						
							2012-03-17 12:15:59 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8a1f175df0  
						 
						
							
							
								
								
								New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements  
							
							 
							
							
							
						 
						
							2012-03-17 11:07:49 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	224dfa848b  
						 
						
							
							
								
								
								bug  #335  network search broken after new ssl policy settings  
							
							 
							
							
							
						 
						
							2012-03-16 05:51:04 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	9243c9fc14  
						 
						
							
							
								
								
								Merge commit 'upstream/master'  
							
							 
							
							
							
						 
						
							2012-03-15 21:11:58 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	4972d7ef6e  
						 
						
							
							
								
								
								more work on filer, comment level and file tag removal  
							
							 
							
							
							
						 
						
							2012-03-13 20:46:37 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	be48fff157  
						 
						
							
							
								
								
								file as widget and basic filing implementation for duepuntozero,slackr  
							
							 
							
							... 
							
							
							
							much more work needed - this is just for test/evaluation currently 
							
						 
						
							2012-03-13 18:13:03 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	5a41676465  
						 
						
							
							
								
								
								initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term,  and theming.  
							
							 
							
							
							
						 
						
							2012-03-13 04:04:26 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	3bc990f718  
						 
						
							
							
								
								
								more save to file backend  
							
							 
							
							
							
						 
						
							2012-03-11 21:32:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	93058af4fc  
						 
						
							
							
								
								
								backend for "save to file" feature  
							
							 
							
							
							
						 
						
							2012-03-11 20:19:56 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	9f76d96d46  
						 
						
							
							
								
								
								Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.  
							
							 
							
							
							
						 
						
							2012-03-11 19:11:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	670b571c8a  
						 
						
							
							
								
								
								Caching improved.  
							
							 
							
							
							
						 
						
							2012-03-10 18:19:00 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	74b3e9f273  
						 
						
							
							
								
								
								Enabled Caching for items. Changed color of tags in diabook.  
							
							 
							
							
							
						 
						
							2012-03-10 15:50:35 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	415ca107fd  
						 
						
							
							
								
								
								Merge branch 'master', remote-tracking branch 'remotes/upstream/master'  
							
							 
							
							... 
							
							
							
							* remotes/upstream/master:
  fix html reshares when editplain in use
* master: 
							
						 
						
							2012-03-06 18:38:44 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
								
							
							
	67456bad06  
						 
						
							
							
								
								
								Fixed...merged with mainline THEN added beards.  
							
							 
							
							
							
						 
						
							2012-03-06 20:50:38 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
								
							
							
	a265afe7eb  
						 
						
							
							
								
								
								added beard smileys  
							
							 
							
							
							
						 
						
							2012-03-06 20:44:53 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	eec4cff84b  
						 
						
							
							
								
								
								remove "smilie" expansion for Diaspora logo  
							
							 
							
							
							
						 
						
							2012-03-06 04:28:45 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	60e5dda1b5  
						 
						
							
							
								
								
								template proc: first optimization  
							
							 
							
							
							
						 
						
							2012-03-02 12:24:35 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	f1bf6dcdfb  
						 
						
							
							
								
								
								expand multiple heart smilies e.g. <3333  
							
							 
							
							
							
						 
						
							2012-03-02 01:24:20 -08:00