tommy tomson 
								
							 
						 
						
							
							
								
							
							
	77a0570162  
						 
						
							
							
								
								
								add link "remove account" to /mod/settings.php  
							
							 
							
							
							
						 
						
							2012-04-26 17:21:27 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	00cb7f9efb  
						 
						
							
							
								
								
								don't allow non-existent themes as choices  
							
							 
							
							
							
						 
						
							2012-04-22 16:24:29 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	972c01edb3  
						 
						
							
							
								
								
								profile change activities  
							
							 
							
							
							
						 
						
							2012-04-12 21:10:32 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	32cd62ff0a  
						 
						
							
							
								
								
								allow setting default new friend notify  
							
							 
							
							
							
						 
						
							2012-04-12 18:15:46 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	18ecac4e93  
						 
						
							
							
								
								
								settings: remove call to profile_load()  
							
							 
							
							
							
						 
						
							2012-04-12 08:42:00 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	e992e29685  
						 
						
							
							
								
								
								settings: move tabs to aside. add a new template "generic_links_widget.tpl"  
							
							 
							
							
							
						 
						
							2012-04-12 08:38:55 +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 
								
							 
						 
						
							
							
								
							
							
	8e928d101b  
						 
						
							
							
								
								
								display settings hooks  
							
							 
							
							
							
						 
						
							2012-04-03 22:01:52 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	5c2fdc795f  
						 
						
							
							
								
								
								send unverified private mail using zrl  
							
							 
							
							
							
						 
						
							2012-04-01 00:59:35 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	b4b1055b50  
						 
						
							
							
								
								
								settings for unknown private mail acceptance  
							
							 
							
							
							
						 
						
							2012-03-31 00:57:59 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	054d21a2e8  
						 
						
							
							
								
								
								settings: add "display settings" tab, with UI-related settings.  
							
							 
							
							... 
							
							
							
							Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property. 
							
						 
						
							2012-03-30 15:45:02 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	4fe0b56d76  
						 
						
							
							
								
								
								bug  #349  - email notls setting  
							
							 
							
							
							
						 
						
							2012-03-28 14:54:00 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	82cc86a41a  
						 
						
							
							
								
								
								user settings: don't show emoticons  
							
							 
							
							
							
						 
						
							2012-03-23 12:07:22 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	139a86dbd3  
						 
						
							
							
								
								
								some openid fixes, use identity url from openid server and normalise it.  
							
							 
							
							
							
						 
						
							2012-03-19 06:48:11 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	82f2bfea5b  
						 
						
							
							
								
								
								convert boolean or int settings to strings to work around issues with template processing  
							
							 
							
							
							
						 
						
							2012-03-16 16:05:16 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	110e8f2919  
						 
						
							
							
								
								
								basic ssl_policy for important modules  
							
							 
							
							
							
						 
						
							2012-03-14 21:20:20 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	7e270b043c  
						 
						
							
							
								
								
								addon settings form error  
							
							 
							
							
							
						 
						
							2012-03-13 23:52:13 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tobias Hößl 
								
							 
						 
						
							
							
								
							
							
	59766b944c  
						 
						
							
							
								
								
								Some security against XSRF-attacks  
							
							 
							
							
							
						 
						
							2012-03-12 20:17:37 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Johnston 
								
							 
						 
						
							
							
								
							
							
	fd1f8fb436  
						 
						
							
							
								
								
								allow user to set number of items to show on network page  
							
							 
							
							
							
						 
						
							2012-03-09 21:29:39 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	53412dacd4  
						 
						
							
							
								
								
								update globaldir when page-type changes, add spam date field  
							
							 
							
							
							
						 
						
							2012-02-27 23:27:16 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael 
								
							 
						 
						
							
							
								
							
							
	fe3dfbee56  
						 
						
							
							
								
								
								Mail: New options for actions after importing mails.  
							
							 
							
							
							
						 
						
							2012-02-26 23:39:29 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	44c23cda8e  
						 
						
							
							
								
								
								theme shakeup commences - themes are now administered in admin panel.  
							
							 
							
							
							
						 
						
							2012-02-23 20:29:09 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	73bee08ac2  
						 
						
							
							
								
								
								enable ajax calendar with $a->config['experimentals']['new_calendar']=1  
							
							 
							
							
							
						 
						
							2012-02-15 12:47:50 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	ffe7d8b1e9  
						 
						
							
							
								
								
								item tag notifications  
							
							 
							
							
							
						 
						
							2012-02-09 21:18:50 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	c76b224d8a  
						 
						
							
							
								
								
								prune old expired and deleted items  
							
							 
							
							
							
						 
						
							2012-01-30 15:13:24 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	167ab537b5  
						 
						
							
							
								
								
								backend for delegating forums  
							
							 
							
							
							
						 
						
							2012-01-26 16:52:12 -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 
								
							 
						 
						
							
							
								
							
							
	969cd145ce  
						 
						
							
							
								
								
								suggestion notifications  
							
							 
							
							
							
						 
						
							2012-01-03 17:29:07 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									root 
								
							 
						 
						
							
							
								
							
							
	09be90be02  
						 
						
							
							
								
								
								modified:   settings.php corrected TLS email connector not working due to spelling mistake.  
							
							 
							
							
							
						 
						
							2011-12-25 22:52:15 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	e67f69df81  
						 
						
							
							
								
								
								default ajax settings after conversion  
							
							 
							
							
							
						 
						
							2011-12-12 17:30:29 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	e74a960327  
						 
						
							
							
								
								
								change default ajax interval to 40 seconds  
							
							 
							
							
							
						 
						
							2011-12-12 17:10:19 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	a38d3b82b9  
						 
						
							
							
								
								
								browser_update settings  
							
							 
							
							
							
						 
						
							2011-12-11 21:03:33 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	034038849c  
						 
						
							
							
								
								
								mysql error report fix (no mysqli), suggested friends for new members settings  
							
							 
							
							
							
						 
						
							2011-11-28 19:28:33 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	f4e1135f79  
						 
						
							
							
								
								
								poco addition to provide a "suggestme" for new members  
							
							 
							
							
							
						 
						
							2011-11-28 15:11:59 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	c568493f57  
						 
						
							
							
								
								
								add expire_starred option, fix "delete selected" on some themes, new project name in email templates  
							
							 
							
							
							
						 
						
							2011-11-21 19:01:05 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	79603e3146  
						 
						
							
							
								
								
								expire settings for items, notes and photos.  
							
							 
							
							... 
							
							
							
							show default privacy acl in popup 
							
						 
						
							2011-11-17 15:53:59 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	b4218614ed  
						 
						
							
							
								
								
								change hide profile setting text  
							
							 
							
							
							
						 
						
							2011-11-16 04:15:14 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	0becdb01db  
						 
						
							
							
								
								
								oauth: fix add new app  
							
							 
							
							
							
						 
						
							2011-11-07 17:54:46 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	00c342e13d  
						 
						
							
							
								
								
								Merge branch 'oauthapi'  
							
							 
							
							
							
						 
						
							2011-11-07 17:41:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	4407fc2c5d  
						 
						
							
							
								
								
								oauth apps/authorization management in settings page  
							
							 
							
							
							
						 
						
							2011-11-07 17:38:30 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	69e41f7703  
						 
						
							
							
								
								
								oauth: authorize view, wrong verifier.  
							
							 
							
							
							
						 
						
							2011-11-02 09:54:07 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	ff7fc68382  
						 
						
							
							
								
								
								oauthapi: authorize app  
							
							 
							
							
							
						 
						
							2011-10-26 17:15:36 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	efe3365431  
						 
						
							
							
								
								
								tag privacy settings  
							
							 
							
							
							
						 
						
							2011-10-24 21:11:05 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	da416e0181  
						 
						
							
							
								
								
								bug in diaspora_reshare  
							
							 
							
							
							
						 
						
							2011-10-20 05:43:33 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	19129e06c3  
						 
						
							
							
								
								
								diaspora_reshare no content found, d* profile message work in progress, network page fix for cid search using post order  
							
							 
							
							
							
						 
						
							2011-10-19 15:08:16 -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 
								
							 
						 
						
							
							
								
							
							
	f64e2d63b9  
						 
						
							
							
								
								
								New common tab template. Update css  
							
							 
							
							
							
						 
						
							2011-10-10 15:28:34 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	07b6c868b3  
						 
						
							
							
								
								
								remove javascript to set selectect nav item. enanche img template prefetch ignoring  
							
							 
							
							
							
						 
						
							2011-08-17 18:36:24 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabio Comuni 
								
							 
						 
						
							
							
								
							
							
	e6444adafd  
						 
						
							
							
								
								
								change nav selected css class  
							
							 
							
							
							
						 
						
							2011-07-25 16:52:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	74a608e1c7  
						 
						
							
							
								
								
								openid settings appearing when disabled, don't tag numbers, install admin not getting set  
							
							 
							
							
							
						 
						
							2011-07-12 23:14:38 -07:00