summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Log last cron executionkondou2014-03-121-0/+3
| | | | Fixes #2012
* Config to disable basic_auth username chackingkondou2014-02-261-0/+3
| | | | This can be confusing and/or annoying
* Merge pull request #7259 from owncloud/overwritehost-alwaysLukas Reschke2014-02-221-0/+3
|\ | | | | Add overwritehost config on setup and upgrade
| * Add overwritehost config on setup and upgradeLukas Reschke2014-02-211-0/+3
| |
* | Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-211-0/+3
|\ \ | | | | | | | | | | | | Conflicts: config/config.sample.php
| * \ Merge pull request #6999 from kofemann/mount-configLukas Reschke2014-02-201-0/+3
| |\ \ | | |/ | |/| mount: make location of mount.json configurable
| | * mount: make location of mount.json configurableTigran Mkrtchyan2014-01-291-0/+3
| | | | | | | | | | | | | | | | | | do not share users data with config files Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
* | | IndentationLukas Reschke2014-02-201-2/+2
| | |
* | | integrate assetic for asset pipeline-ingThomas Müller2014-02-201-0/+3
|/ /
* | Merge pull request #6247 from owncloud/memcached-multiple-serversAndreas Fischer2014-02-081-2/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | Add support for multiple memcached servers. * owncloud/memcached-multiple-servers: Readd support for memcached_server config variable. Add support for multiple memcached servers.
| * | Add support for multiple memcached servers.Andreas Fischer2014-01-101-2/+8
| | |
* | | Added session_keepalive settingVincent Petry2014-02-041-0/+7
| |/ |/| | | | | | | When session_keepalive is true (default) the heartbeat will be send as often as the half of the session timeout value.
* | updated config.sample.php with mail_from_address parameterJens-Christian Fischer2014-01-241-0/+6
|/
* Document memcached settings in config.sample.phpAndreas Fischer2013-12-091-0/+3
|
* Merge branch 'master' into backgroundscan-reuse-etagRobin Appelman2013-12-061-2/+5
|\
| * config switch to disable auto expire for the trash binBjoern Schiessle2013-12-041-2/+5
| |
* | get rid of failing test that don't cause additional downloadsRobin Appelman2013-12-061-0/+0
|/
* add documentation for single user config option to config.sample.phpRobin Appelman2013-11-251-0/+3
|
* Update config.sample.phpWikinaut2013-11-121-1/+5
| | | | | | | /* Enable maintenance mode to disable ownCloud If you want to prevent users to login to ownCloud before you start doing some maintenance work, you need to set the value of the maintenance parameter to true. Please keep in mind that users who are already logged-in are kicked out of ownCloud instantly. */
* add options to disable the check for a working .htaccess file in data and ↵Frank Karlitschek2013-10-171-0/+6
| | | | for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout.
* Merge pull request #4780 from AxelRb/masterMorris Jobke2013-10-101-0/+3
|\ | | | | On an auth failure the uid and the IP address should be logged to the st...
| * Added the config option to log ip addresses , default falseAxel Roenn2013-10-091-0/+3
| |
* | let admin specify timezone for log file entriesBjoern Schiessle2013-10-071-0/+3
| |
* | Merge branch 'master' into oc_avatarskondou2013-09-031-3/+5
|\| | | | | | | | | Conflicts: config/config.sample.php
| * Merge pull request #4672 from owncloud/ocs_cleanupblizzz2013-09-021-3/+0
| |\ | | | | | | Ocs cleanup
| | * remove the config option that is no longer neededFrank Karlitschek2013-08-311-3/+0
| | |
| * | Employ config option for OpenSSL config file, if provided.Owen Winkler2013-09-021-1/+1
| | | | | | | | | | | | This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
| * | Start a branch for easier OpenSSL configuration.Owen Winkler2013-09-021-0/+5
| |/
* / Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-011-0/+3
|/
* Merge master into oc_previewGeorg Ehrke2013-08-291-2/+12
|\
| * Only enable logrotate when configured. Also rotate size is settable.Bart Visscher2013-08-281-3/+12
| |
* | invert logic of disable_previewsGeorg Ehrke2013-08-291-1/+1
| |
* | make it possible to disable previewsGeorg Ehrke2013-08-231-0/+1
| |
* | style fixes for preview libGeorg Ehrke2013-08-191-0/+2
| |
* | fix merge conflictsGeorg Ehrke2013-08-051-1/+6
|\|
| * Merge pull request #4293 from owncloud/config-dateThomas Müller2013-08-041-1/+4
| |\ | | | | | | make log date configurable, default to iso 8601
| | * add 'logdateformat' to config.sample.phpThomas Müller2013-08-041-1/+4
| | |
| * | users's -> user'sLennart Rosam2013-08-021-1/+1
| | |
| * | Fix typo (again >.<).. gnahLennart Rosam2013-08-021-1/+1
| | |
| * | Make default language configurable via config.phpLennart Rosam2013-08-021-1/+4
| |/
* | Merge branch 'master' into oc_previewThomas Müller2013-07-301-8/+8
|\| | | | | | | | | | | Conflicts: 3rdparty lib/template.php
| * reduce time for auto expire to 30 days by defaultBjörn Schießle2013-07-261-2/+2
| |
| * Fix some typoskondou2013-07-161-6/+6
| |
* | fix syntax in config.sample.phpGeorg Ehrke2013-07-291-1/+1
| |
* | merge conflicts ...Georg Ehrke2013-07-101-0/+3
|\|
| * session_life_time -> session_lifetimeThomas Mueller2013-06-281-1/+1
| | | | | | | | | | default session_lifetime is 24hrs recreation of session is triggered at 50% of the session life time
| * session life time is now configurable and set to the same valueThomas Mueller2013-06-261-0/+3
| |
* | yet another update for config.sample.phpGeorg Ehrke2013-06-051-1/+1
| |
* | update config.sample.phpGeorg Ehrke2013-06-051-0/+2
| |
* | add sample config for previewsGeorg Ehrke2013-05-251-0/+8
|/