Craig Andrews 
							
						 
					 
					
						
						
							
						
						2a6b3be4e6 
					 
					
						
						
							
							correct config.php.sample documentation of sendfile  
						
						 
						
						
						
						
					 
					
						2010-05-04 14:19:02 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						47034553fe 
					 
					
						
						
							
							Merge commit 'mainline/0.9.x' into 0.9.x  
						
						 
						
						
						
						
					 
					
						2010-03-10 20:47:49 +13:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						42463e160d 
					 
					
						
						
							
							Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x  
						
						 
						
						
						
						
					 
					
						2010-03-08 13:37:45 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						c89ed16d24 
					 
					
						
						
							
							Merge commit 'origin/0.9.x' into 0.9.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	lib/schema.php 
						
						
					 
					
						2010-03-07 09:30:07 +13:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e97515c877 
					 
					
						
						
							
							Remove unused variables, update Twitter ones  
						
						 
						
						
						
						
					 
					
						2010-03-05 17:05:55 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						5adb494c26 
					 
					
						
						
							
							Remove unused variables, update Twitter ones  
						
						 
						
						
						
						
					 
					
						2010-03-05 17:05:00 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						248aed7cf4 
					 
					
						
						
							
							ticket  #697 : merge two dupe config bits in config.php.sample  
						
						 
						
						
						
						
					 
					
						2010-03-05 12:21:30 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						f9dd83caa7 
					 
					
						
						
							
							Modify configuration to have an option to allow uploads regardless of mime type  
						
						 
						
						
						
						
					 
					
						2010-03-01 21:44:41 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						4de09d6bd4 
					 
					
						
						
							
							Merge commit 'origin/0.9.x' into 0.9.x  
						
						 
						
						
						
						
					 
					
						2010-01-09 21:43:25 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						250bcfa8dc 
					 
					
						
						
							
							Require users to login to view attachments on private sites  
						
						 
						
						... 
						
						
						
						Thank you jeff-themovie for this implementation! 
						
						
					 
					
						2010-01-05 17:49:28 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						a5c11cc92a 
					 
					
						
						
							
							Merge commit 'origin/0.9.x' into 0.9.x  
						
						 
						
						
						
						
					 
					
						2009-12-08 23:45:54 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brion Vibber 
							
						 
					 
					
						
						
							
						
						3536f01258 
					 
					
						
						
							
							Make default & sample val for $config['queue']['queue_basename'] actually work! Now matches the recommendation in README which is in fact correct. Must include the /queue/ prefix (unless somthing else actually makes sense)  
						
						 
						
						
						
						
					 
					
						2009-12-08 09:57:37 -08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						51f0dd5e37 
					 
					
						
						
							
							Add configuration option to toggle the indenting of the output HTML. Defaults to indent enabled.  
						
						 
						
						
						
						
					 
					
						2009-12-05 01:03:04 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brenda Wallace 
							
						 
					 
					
						
						
							
						
						e42c18eded 
					 
					
						
						
							
							added url to twitter's docs  
						
						 
						
						
						
						
					 
					
						2009-12-03 00:10:21 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						0b4390e7f2 
					 
					
						
						
							
							Make email domain checking optional, as some statusnet installations (such as those behind restrictive corporate firewalls, or on home systems on restrictive connections) cannot connect to any mail  
						
						 
						
						... 
						
						
						
						systems, and this check will always fail. 
						
						
					 
					
						2009-10-26 10:31:12 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						5d09b6b3f0 
					 
					
						
						
							
							Merge branch '0.8.x' into 0.9.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	EVENTS.txt
	actions/finishremotesubscribe.php
	actions/postnotice.php
	actions/public.php
	actions/remotesubscribe.php
	actions/showstream.php
	actions/updateprofile.php
	actions/userauthorization.php
	classes/laconica.ini
	lib/common.php
	lib/oauthstore.php
	lib/omb.php 
						
						
					 
					
						2009-08-27 11:16:45 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						a0b5eb7c03 
					 
					
						
						
							
							statusize config.php.sample  
						
						 
						
						
						
						
					 
					
						2009-08-26 11:31:44 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						3567b9d708 
					 
					
						
						
							
							global search and replace for laconica -> statusnet  
						
						 
						
						
						
						
					 
					
						2009-08-25 18:53:24 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						59beff6b46 
					 
					
						
						
							
							Revert "Added configuration option to only allow OpenID logins."  
						
						 
						
						... 
						
						
						
						This reverts commit 14b46e2183 .
This functionality will need to be rewritten to work with the new
OpenIDPlugin.
Conflicts:
	index.php
	lib/logingroupnav.php 
						
						
					 
					
						2009-08-21 16:45:42 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						bacef32aac 
					 
					
						
						
							
							Revert "Added a configuration option to disable OpenID."  
						
						 
						
						... 
						
						
						
						This reverts commit 7dc3a90d12 .
Conflicts:
	actions/login.php
	actions/register.php
	lib/accountsettingsaction.php
	lib/common.php
	lib/logingroupnav.php 
						
						
					 
					
						2009-08-21 16:38:39 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mEDI 
							
						 
					 
					
						
						
							
						
						0535b43944 
					 
					
						
						
							
							add $config['attachments']['path'] to the config.php.sample  
						
						 
						
						
						
						
					 
					
						2009-08-20 13:24:46 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeffery To 
							
						 
					 
					
						
						
							
						
						7dc3a90d12 
					 
					
						
						
							
							Added a configuration option to disable OpenID.  
						
						 
						
						... 
						
						
						
						If $config['openid']['enabled'] is set to false, OpenID is removed from
the navigation and direct accesses to OpenID login pages redirect to the
login page.
If OpenID is enabled, $config['site']['openidonly'] is ignored, i.e.
OpenID is required to go OpenID-only. 
						
						
					 
					
						2009-08-13 22:18:06 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Craig Andrews 
							
						 
					 
					
						
						
							
						
						e9ed20a69d 
					 
					
						
						
							
							Merge commit 'jeff-themovie/0.8.x-openidonly' into 0.8.x  
						
						 
						
						
						
						
					 
					
						2009-08-10 11:53:35 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						17dcf1c317 
					 
					
						
						
							
							Merge branch 'twitter-oauth' into 0.8.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	scripts/getvaliddaemons.php 
						
						
					 
					
						2009-08-10 07:49:51 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						06c5f490ea 
					 
					
						
						
							
							Add Twitter OAuth key and secret example  
						
						 
						
						
						
						
					 
					
						2009-08-10 07:21:35 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeffery To 
							
						 
					 
					
						
						
							
						
						14b46e2183 
					 
					
						
						
							
							Added configuration option to only allow OpenID logins.  
						
						 
						
						... 
						
						
						
						If $config['site']['openidonly'] is set to true:
* the Login/Register pages will be removed from the navigation;
* directly accesses to the Login/Register pages will redirect to the
  OpenID login page;
* most links to the Login/Register pages will link to the OpenID login
  page instead.
The user will still need to set a password to access the API and RSS
feeds. 
						
						
					 
					
						2009-08-10 13:57:39 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeffery To 
							
						 
					 
					
						
						
							
						
						5f293f0e2f 
					 
					
						
						
							
							Added configuration option to disable post-by-email.  
						
						 
						
						... 
						
						
						
						This hides the relevant settings from the email settings page and
prevents maildaemon.php from processing email if the option is
disabled. 
						
						
					 
					
						2009-08-07 01:55:31 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeffery To 
							
						 
					 
					
						
						
							
						
						93f585446e 
					 
					
						
						
							
							Added configuration options to enable/disable SMS and Twitter integration.  
						
						 
						
						... 
						
						
						
						This disables the IM, SMS and Twitter settings pages and queue handlers
depending on the config options. 
						
						
					 
					
						2009-08-07 01:18:17 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						ae81d36137 
					 
					
						
						
							
							Site-wide design configuration  
						
						 
						
						... 
						
						
						
						I added some code so that the site-wide design can be set, using the
configuration interface.
I also moved the configuration option from
$config['site']['design']['background'] to just
$config['design']['background'], but the old syntax will still work. 
						
						
					 
					
						2009-07-30 16:24:04 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						0c8d003d40 
					 
					
						
						
							
							Added config options for site's default design value  
						
						 
						
						
						
						
					 
					
						2009-07-27 16:57:30 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						c02acd7341 
					 
					
						
						
							
							Better comment about syslog log facility  
						
						 
						
						
						
						
					 
					
						2009-07-02 16:16:17 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						d80c553e5f 
					 
					
						
						
							
							Make logging facility configurable  
						
						 
						
						
						
						
					 
					
						2009-07-02 16:06:13 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeffery To 
							
						 
					 
					
						
						
							
						
						6328add622 
					 
					
						
						
							
							Merge branch '0.8.x' into invite-enabled  
						
						 
						
						
						
						
					 
					
						2009-06-26 15:31:42 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						e506f82cdf 
					 
					
						
						
							
							Better avatar handling - pull in any missing Twitter avatars  
						
						 
						
						
						
						
					 
					
						2009-06-18 16:51:06 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zach Copley 
							
						 
					 
					
						
						
							
						
						65457e73bf 
					 
					
						
						
							
							Config option for bidirectional Twitter bridge  
						
						 
						
						
						
						
					 
					
						2009-06-18 10:51:43 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robin Millette 
							
						 
					 
					
						
						
							
						
						b58dc5e961 
					 
					
						
						
							
							Added config option to enable or disable file uploads with notices.  
						
						 
						
						
						
						
					 
					
						2009-06-17 16:55:01 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robin Millette 
							
						 
					 
					
						
						
							
						
						28d02ec8cd 
					 
					
						
						
							
							Make oohembed endpoint configurable.  
						
						 
						
						
						
						
					 
					
						2009-06-17 16:44:33 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jeffery To 
							
						 
					 
					
						
						
							
						
						6d308f6ffe 
					 
					
						
						
							
							Adds $config['invite']['enabled'] to enable/disable invites.  
						
						 
						
						... 
						
						
						
						The invite function may not applicable for private and/or closed installs. This adds a configuration option to enable/disable invites (defaulting to enabled), hides the "Invite" nav item when necessary, and adds a check to actions/invite.php.
Note that I haven't tried the Facebook application so I didn't add any checks to actions/facebookinvite.php. 
						
						
					 
					
						2009-06-14 16:17:22 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robin Millette 
							
						 
					 
					
						
						
							
						
						3e0c291810 
					 
					
						
						
							
							Added configurable options for attachments: supported mimetypes and quotas for uploads.  
						
						 
						
						
						
						
					 
					
						2009-05-31 16:42:29 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						b233e7b3f0 
					 
					
						
						
							
							document snapshot options  
						
						 
						
						
						
						
					 
					
						2009-04-16 10:16:22 -07:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						d6b336a938 
					 
					
						
						
							
							change # comments to // in config.php.sample  
						
						 
						
						
						
						
					 
					
						2009-04-16 12:55:33 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						d6a31c90a8 
					 
					
						
						
							
							Removed skin config option  
						
						 
						
						
						
						
					 
					
						2009-04-14 23:17:25 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						e34011f1bd 
					 
					
						
						
							
							Merge branch '0.7.x' into 0.8.x  
						
						 
						
						
						
						
					 
					
						2009-04-13 16:42:53 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						ffa0007350 
					 
					
						
						
							
							Ticket 1419. Added config option to set site to private.  
						
						 
						
						
						
						
					 
					
						2009-04-13 16:40:51 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						030477b02a 
					 
					
						
						
							
							Separation of themes (i.e., layout, typography) and skins (i.e., background  
						
						 
						
						... 
						
						
						
						images, colours).
A theme can have multiple skins.
Majority of the changes in this commit are due to restructuring the
path/files for themes and skins.
Both theme and skin will be set to 'default' if not set in
config.php.
This commit also allows each instance of this software to create
its own theme without having to override any style from the default
distribution.
Added Cloudy theme. 
						
						
					 
					
						2009-04-12 02:08:55 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sarven Capadisli 
							
						 
					 
					
						
						
							
						
						03a4a4bebf 
					 
					
						
						
							
							Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x  
						
						 
						
						
						
						
					 
					
						2009-04-08 22:55:34 +00:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						00dfdb3f3a 
					 
					
						
						
							
							Merge branch 'master' of git://gitorious.org/laconica/brianjesse-clone into brianjesse-clone/master  
						
						 
						
						
						
						
					 
					
						2009-04-07 22:32:58 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						60861760fc 
					 
					
						
						
							
							Host multiple sites with the same codebase  
						
						 
						
						... 
						
						
						
						This is the beginning of the code for status.net and related status
farms. It will read basic information about a site from a shared,
central database and use the data stored there to switch on the
hostname. 
						
						
					 
					
						2009-04-07 17:10:54 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						6be15dfcac 
					 
					
						
						
							
							Merge branch '0.8.x' of git://gitorious.org/laconica/fmarani-clone into fmarani/0.8.x  
						
						 
						
						
						
						
					 
					
						2009-04-02 06:23:50 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evan Prodromou 
							
						 
					 
					
						
						
							
						
						07eae0ce4d 
					 
					
						
						
							
							Support SSL for some, all, or no pages  
						
						 
						
						... 
						
						
						
						Support SSL URLs either for all pages; no pages; or for sensitive
pages accepting passwords, like login, registration, API, and others. 
						
						
					 
					
						2009-03-26 15:03:59 -04:00