Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	0f25455d1b  
						 
						
							
							
								
								
								starting switching to colorbox  
							
							 
							
							
							
						 
						
							2013-02-04 18:09:56 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	6668d22d37  
						 
						
							
							
								
								
								try to improve TinyMCE block handling  
							
							 
							
							
							
						 
						
							2013-01-27 14:41:48 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	6effdd570c  
						 
						
							
							
								
								
								add a confirm dialog and a busy rotator for delete selected  
							
							 
							
							
							
						 
						
							2012-11-01 17:42:40 -06:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	5cb979f5e4  
						 
						
							
							
								
								
								changes to support a mobile theme  
							
							 
							
							
							
						 
						
							2012-07-23 20:37:00 -06:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	56efb42223  
						 
						
							
							
								
								
								tinymce: add inlinepopups plugin  
							
							 
							
							
							
						 
						
							2012-04-18 14:55:21 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	e2e6b56c44  
						 
						
							
							
								
								
								tinymce: add filebrowser for photos and attached files  
							
							 
							
							
							
						 
						
							2012-04-18 13:23:42 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	0a2675d8b6  
						 
						
							
							
								
								
								filer: replace "file as" prompt with combobox opened in fancybox  
							
							 
							
							
							
						 
						
							2012-03-28 10:49:34 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	7fc57f486f  
						 
						
							
							
								
								
								support autocomplete @-tags in plaintext mode  
							
							 
							
							
							
						 
						
							2012-03-28 00:44:45 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	aba63f8b78  
						 
						
							
							
								
								
								turn on gecko spellcheck in tinymce  
							
							 
							
							
							
						 
						
							2012-03-27 15:20:36 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	6c7b619b34  
						 
						
							
							
								
								
								remove stray template variable from old code  
							
							 
							
							
							
						 
						
							2012-03-20 23:57:33 -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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Simon L'nu 
								
							 
						 
						
							
							
								
							
							
	72e78046af  
						 
						
							
							
								
								
								minor typographical fixes. need to do something about the http on https sites for html5shiv. changed to https on mine  
							
							 
							
							... 
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 
						
							2012-02-27 01:04:41 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	75acc1ed96  
						 
						
							
							
								
								
								support plaintext on editpost, editorinit called before all buttons laid out  
							
							 
							
							
							
						 
						
							2012-02-17 11:49:27 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	8369c243b3  
						 
						
							
							
								
								
								Fix 'item not found' message  
							
							 
							
							
							
						 
						
							2012-02-13 10:19:10 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	3e664dbdfe  
						 
						
							
							
								
								
								reshare in "display" view  
							
							 
							
							
							
						 
						
							2012-02-13 09:33:20 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	ed38808aae  
						 
						
							
							
								
								
								hidden jot in "display" to allow reshare  
							
							 
							
							
							
						 
						
							2012-02-10 17:30:22 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	2b77002471  
						 
						
							
							
								
								
								basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html).  
							
							 
							
							
							
						 
						
							2012-02-06 20:28:50 -08: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 
								
							 
						 
						
							
							
								
							
							
	41bb47ca1b  
						 
						
							
							
								
								
								title fixups  
							
							 
							
							
							
						 
						
							2012-01-06 03:59:05 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	efe308b5ac  
						 
						
							
							
								
								
								Use html5 placeholder for title text input  
							
							 
							
							
							
						 
						
							2012-01-06 09:11:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	a9670cbb7d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendica/master'  
							
							 
							
							
							
						 
						
							2012-01-06 09:10:21 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	2f73be326e  
						 
						
							
							
								
								
								change to hover function  
							
							 
							
							
							
						 
						
							2012-01-04 21:01:24 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	dbb5955469  
						 
						
							
							
								
								
								bit more improvement on dynamic title  
							
							 
							
							
							
						 
						
							2012-01-04 20:35:32 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	f1c7db593c  
						 
						
							
							
								
								
								better title handling (duepuntozero only at this time)  
							
							 
							
							
							
						 
						
							2012-01-04 20:09:14 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	47edaf9ad7  
						 
						
							
							
								
								
								dynamic title input box - via fabrixxm  
							
							 
							
							
							
						 
						
							2012-01-04 18:03:09 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	48a5a2484e  
						 
						
							
							
								
								
								new smiley  
							
							 
							
							
							
						 
						
							2012-01-04 00:04:19 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	16d45e5c13  
						 
						
							
							
								
								
								quattro: first work on jot style  
							
							 
							
							
							
						 
						
							2011-12-19 18:02:43 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	c66b886d7e  
						 
						
							
							
								
								
								shared tags for testbubble, prevent tag hijacking of shared tag activities  
							
							 
							
							
							
						 
						
							2011-11-10 17:11:55 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	d6d4d3ed3a  
						 
						
							
							
								
								
								various testbubble fixes  
							
							 
							
							
							
						 
						
							2011-11-09 00:29:14 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	e19b597180  
						 
						
							
							
								
								
								tinymce tag complete stuff  
							
							 
							
							
							
						 
						
							2011-11-03 20:40:56 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	3b33c0d075  
						 
						
							
							
								
								
								allow tag input to contain leading '#'  
							
							 
							
							
							
						 
						
							2011-10-24 17:00:22 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	3b6b0eaa8b  
						 
						
							
							
								
								
								social tag - add UI  
							
							 
							
							
							
						 
						
							2011-10-24 15:47:17 -07: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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	5792b3d358  
						 
						
							
							
								
								
								Merge branch 'master' into newui  
							
							 
							
							
							
						 
						
							2011-09-26 11:42:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	8a11cec61a  
						 
						
							
							
								
								
								allow setting all the bookmarked URL fields via script/API  
							
							 
							
							
							
						 
						
							2011-09-19 22:21:55 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	20ca451200  
						 
						
							
							
								
								
								move js to js folder  
							
							 
							
							
							
						 
						
							2011-09-05 11:15:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	06802dd8fe  
						 
						
							
							
								
								
								auto focus jot editor  
							
							 
							
							
							
						 
						
							2011-07-25 20:10:21 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	363c4c5798  
						 
						
							
							
								
								
								Remove "share" greyed text in jot editor when user reshare an item  
							
							 
							
							
							
						 
						
							2011-07-25 08:56:51 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	5c9eb19767  
						 
						
							
							
								
								
								fix "resend" function when editor is disabled  
							
							 
							
							
							
						 
						
							2011-07-22 08:46:29 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	7a069c1438  
						 
						
							
							
								
								
								Load tinyMCE on post editor only if needed.  
							
							 
							
							
							
						 
						
							2011-07-20 11:08:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	020deefba6  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendika/master' into newacl  
							
							 
							
							
							
						 
						
							2011-07-20 10:01:12 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	1c9ed08620  
						 
						
							
							
								
								
								show acl selector in a popup with fancybox  
							
							 
							
							
							
						 
						
							2011-07-20 10:00:33 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	1d35d1e5a1  
						 
						
							
							
								
								
								Merge pull request  #141  from fabrixxm/newacl  
							
							 
							
							... 
							
							
							
							New jot ACL selector 
							
						 
						
							2011-07-19 17:24:09 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	9fa0956966  
						 
						
							
							
								
								
								New jot acl selector  
							
							 
							
							
							
						 
						
							2011-07-19 16:17:58 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	07a77a4d27  
						 
						
							
							
								
								
								resize editor  
							
							 
							
							
							
						 
						
							2011-07-18 21:25:49 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	0b221e8945  
						 
						
							
							
								
								
								bug  #96  move libraries to library - better alignment of like rotator  
							
							 
							
							
							
						 
						
							2011-06-28 21:11:52 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	0f3292fefb  
						 
						
							
							
								
								
								revup  
							
							 
							
							
							
						 
						
							2011-06-16 15:26:39 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	c92e6ed929  
						 
						
							
							
								
								
								avoid race condition on delete checked items  
							
							 
							
							
							
						 
						
							2011-06-16 00:38:41 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	e5b54e74ba  
						 
						
							
							
								
								
								delete selected items  
							
							 
							
							
							
						 
						
							2011-06-15 20:43:39 -07:00