eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Browse Source 
Conflicts:
	js/util.min.js
	lib/default.php
This commit is contained in:
Shashi Gowda
2011-04-07 23:13:45 +05:30
parent 14aef781ad 5b9319d081
commit ad86eb78d3
102 changed files with 1382 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/default.php
View File

@@ -53,7 +53,7 @@ $default =
'broughtbyurl' => null,
'closed' => false,
'inviteonly' => false,
'private' => false,
'private' => true,
'ssl' => 'never',
'sslserver' => null,
'shorturllength' => 30,
@@ -274,7 +274,10 @@ $default =
'maxpeople' => 500, // maximum no. of people with the same tag by the same user
'allow_tagging' => array('all' => true), // equivalent to array('local' => true, 'remote' => true)
'desclimit' => null),
'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/'),
'oembed' =>
array('endpoint' => 'http://oohembed.com/oohembed/',
'order' => array('built-in', 'well-known', 'service', 'discovery'),
),
'search' =>
array('type' => 'fulltext'),
'sessions' =>
@@ -306,12 +309,14 @@ $default =
array('disabled' => true),
'plugins' =>
array('default' => array('Geonames' => null,
'Mapstraction' => null,
'OStatus' => null,
'WikiHashtags' => null,
'RSSCloud' => null,
'ClientSideShorten' => null,
'StrictTransportSecurity' => null,
'Bookmark' => null,
'Event' => null,
'Poll' => null,
'QnA' => null,
'SearchSub' => null,
'TagSub' => null,
'OpenID' => null),
'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories
'server' => null,