fabrixxm 
								
							 
						 
						
							
							
								
							
							
	f70f4bb899  
						 
						
							
							
								
								
								ACL: fix TypeError when selecting permissions  
							
							 
							
							
							
						 
						
							2016-02-05 18:43:46 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	3c6ebfa5a9  
						 
						
							
							
								
								
								Vier - mobile friendly ACL window and form fields  
							
							 
							
							
							
						 
						
							2016-02-03 14:03:00 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8b5412068e  
						 
						
							
							
								
								
								When selecting forums there was an added "span" html element.  
							
							 
							
							
							
						 
						
							2014-12-01 22:56:41 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									hauke 
								
							 
						 
						
							
							
								
							
							
	87fa2ee2af  
						 
						
							
							
								
								
								updated jquery to version 1.11, updated themes frost and diabook where necessary  
							
							 
							
							
							
						 
						
							2014-09-06 16:21:03 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	67f844f561  
						 
						
							
							
								
								
								acl automention: fix stupid typo...  
							
							 
							
							
							
						 
						
							2014-01-03 15:17:46 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	ad5a47aecf  
						 
						
							
							
								
								
								add fetaure switch for acl-automention  
							
							 
							
							
							
						 
						
							2014-01-03 14:40:43 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	53dc1ce31f  
						 
						
							
							
								
								
								fix textarea/tinymce, add contact id to mention  
							
							 
							
							
							
						 
						
							2013-12-18 10:48:09 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	9a94c35120  
						 
						
							
							
								
								
								acl selector add and remove mentions when a forum is selected.  
							
							 
							
							
							
						 
						
							2013-12-18 10:18:26 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	74caf1a4a7  
						 
						
							
							
								
								
								* Add MIME types for file attachments  
							
							 
							
							... 
							
							
							
							* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files 
							
						 
						
							2013-01-12 06:31:32 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olaf Conradi 
								
							 
						 
						
							
							
								
							
							
	2943550fe2  
						 
						
							
							
								
								
								No need to remove data-src attributes  
							
							 
							
							... 
							
							
							
							Better comment string also 
							
						 
						
							2013-01-02 14:28:13 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olaf Conradi 
								
							 
						 
						
							
							
								
							
							
	6a2bd8b29f  
						 
						
							
							
								
								
								Don't replace data-src with src in acl-template  
							
							 
							
							... 
							
							
							
							On pageload an empty acl-list-item as template is created and not yet replaced.
Don't change the data-src for src attributes in those images. 
							
						 
						
							2012-12-31 00:01:15 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olaf Conradi 
								
							 
						 
						
							
							
								
							
							
	94c8d7693f  
						 
						
							
							
								
								
								Keep html in template, use data attribute for img  
							
							 
							
							... 
							
							
							
							Revert previous changes to fix browser preloading a template variable as image.
Images use a data attribute within templates as src.
Javascript will substitute them. 
							
						 
						
							2012-12-29 23:44:26 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Olaf Conradi 
								
							 
						 
						
							
							
								
							
							
	239110a2bc  
						 
						
							
							
								
								
								Change acl selection box templating  
							
							 
							
							... 
							
							
							
							Keep dynamic templating in javascript so browsers don't
prefetch non-existing files. 
							
						 
						
							2012-12-28 23:28:53 +01: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 
								
							 
						 
						
							
							
								
							
							
	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 
								
							 
						 
						
							
							
								
							
							
	e764990ce4  
						 
						
							
							
								
								
								better handling of the display of conflicting group permissions  
							
							 
							
							
							
						 
						
							2011-12-21 18:04:24 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	2e088aad8d  
						 
						
							
							
								
								
								bug  #246  
							
							 
							
							
							
						 
						
							2011-12-20 19:11:46 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	7fbfbdae07  
						 
						
							
							
								
								
								audio/video bb tags showing up on Diaspora  
							
							 
							
							
							
						 
						
							2011-12-20 17:01:41 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	7e2284043f  
						 
						
							
							
								
								
								show profile url in ACL hovertips, add fork identifier to json siteinfo  
							
							 
							
							
							
						 
						
							2011-09-27 05:02:25 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	9d2afc2d3c  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendika/master' into newui  
							
							 
							
							
							
						 
						
							2011-09-16 09:39:29 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	20ca451200  
						 
						
							
							
								
								
								move js to js folder  
							
							 
							
							
							
						 
						
							2011-09-05 11:15:30 +02:00