mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 06:35:15 +00:00
Merge https://github.com/redmatrix/hubzilla into pending_merge
This commit is contained in:
commit
5f1eb18da4
3 changed files with 3 additions and 3 deletions
|
@ -50,7 +50,7 @@ function get_features($filtered = true) {
|
|||
array('profile_export', t('Profile Import/Export'), t('Save and load profile details across sites/channels'),false,get_config('feature_lock','profile_export')),
|
||||
array('webpages', t('Web Pages'), t('Provide managed web pages on your channel'),false,get_config('feature_lock','webpages')),
|
||||
array('hide_rating', t('Hide Rating'), t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),false,get_config('feature_lock','hide_rating')),
|
||||
array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders'),false,get_config('feature_lock','private_notes')),
|
||||
array('private_notes', t('Private Notes'), t('Enables a tool to store notes and reminders (note: not encrypted)'),false,get_config('feature_lock','private_notes')),
|
||||
array('nav_channel_select', t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')),
|
||||
array('photo_location', t('Photo Location'), t('If location data is available on uploaded photos, link this to a map.'),false,get_config('feature_lock','photo_location')),
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ $db_type = 0; // use 1 for postgres, 0 for mysql
|
|||
|
||||
$default_timezone = 'America/Los_Angeles';
|
||||
|
||||
// What is your site name?
|
||||
// What is your site name? DO NOT ADD A TRAILING SLASH!
|
||||
|
||||
$a->config['system']['baseurl'] = 'https://myredsite.example';
|
||||
$a->config['system']['sitename'] = "Hubzilla";
|
||||
|
|
|
@ -28,7 +28,7 @@ $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
|
|||
|
||||
$default_timezone = '{{$timezone}}';
|
||||
|
||||
// What is your site name?
|
||||
// What is your site name? DO NOT ADD A TRAILING SLASH!
|
||||
|
||||
$a->config['system']['baseurl'] = '{{$siteurl}}';
|
||||
$a->config['system']['sitename'] = "Hubzilla";
|
||||
|
|
Loading…
Reference in a new issue