Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

This commit is contained in:
Federico Marani
2009-03-16 22:43:51 +00:00
70 changed files with 2440 additions and 746 deletions

View File

@@ -37,6 +37,9 @@ $config['site']['path'] = 'laconica';
# Enables extra log information, for example full details of PEAR DB errors
#$config['site']['logdebug'] = true;
#To set your own logo, overriding the one in the theme
#$config['site']['logo'] = '/mylogo.png';
# This is a PEAR DB DSN, see http://pear.php.net/manual/en/package.database.db.intro-dsn.php
# Set it to match your actual database
@@ -167,3 +170,15 @@ $config['sphinx']['port'] = 3312;
# Add Google Analytics
# require_once('plugins/GoogleAnalyticsPlugin.php');
# $ga = new GoogleAnalyticsPlugin('your secret code');
#Don't allow saying the same thing more than once per hour
#$config['site']['dupelimit'] = 3600;
#Don't enforce the dupe limit
#$config['site']['dupelimit'] = -1;
#Base string for minting Tag URIs in Atom feeds. Defaults to
#"yourserver,2009". This needs to be configured properly for your Atom
#feeds to validate. See: http://www.faqs.org/rfcs/rfc4151.html and
#http://taguri.org/ Examples:
#$config['integration']['taguri'] = 'example.net,2008';
#$config['integration']['taguri'] = 'admin@example.net,2009-03-09'