diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-17 13:15:22 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-08-17 13:15:22 +0200 |
| commit | cabe92ef1240e171a812f5822ac69b4d7742fd71 (patch) | |
| tree | 469e9089107d440da0c12c291abbd626d6d08b33 /config | |
| parent | 7adfc27cafa6f94962a33c158af9c45e71e012c5 (diff) | |
| parent | d3e2f31adad5eeaf415154dd2fb88cb9fec0b3c1 (diff) | |
| download | nextcloud-server-cabe92ef1240e171a812f5822ac69b4d7742fd71.tar.gz nextcloud-server-cabe92ef1240e171a812f5822ac69b4d7742fd71.zip | |
Merge branch 'master' into decrypt_files_again
Conflicts:
apps/files_encryption/tests/keymanager.php
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.sample.php | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 4d1950d60ee..24ba541ac5c 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -56,6 +56,9 @@ $CONFIG = array( /* Theme to use for ownCloud */ "theme" => "", +/* Optional ownCloud default language - overrides automatic language detection on public pages like login or shared items. This has no effect on the user's language preference configured under "personal -> language" once they have logged in */ +"default_language" => "en", + /* Path to the parent directory of the 3rdparty directory */ "3rdpartyroot" => "", @@ -114,8 +117,8 @@ $CONFIG = array( /* Password to use for sendmail mail, depends on mail_smtpauth if this is used */ "mail_smtppassword" => "", -/* How long should ownCloud keep deleted files in the trash bin, default value: 180 days */ -'trashbin_retention_obligation' => 180, +/* How long should ownCloud keep deleted files in the trash bin, default value: 30 days */ +'trashbin_retention_obligation' => 30, /* allow user to change his display name, if it is supported by the back-end */ 'allow_user_to_change_display_name' => true, @@ -154,7 +157,7 @@ $CONFIG = array( /* Enable/disable X-Frame-Restriction */ /* HIGH SECURITY RISK IF DISABLED*/ "xframe_restriction" => true, - + /* The directory where the user data is stored, default to data in the owncloud * directory. The sqlite database is also stored here, when sqlite is used. */ @@ -185,5 +188,8 @@ $CONFIG = array( //links to custom clients 'customclient_desktop' => '', //http://owncloud.org/sync-clients/ 'customclient_android' => '', //https://play.google.com/store/apps/details?id=com.owncloud.android -'customclient_ios' => '' //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8 +'customclient_ios' => '', //https://itunes.apple.com/us/app/owncloud/id543672169?mt=8 + +// date format to be used while writing to the owncloud logfile +'logdateformat' => 'F d, Y H:i:s' ); |