summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8607 from owncloud/filescan_app_hookOwen Winkler2014-05-301-1/+4
|\
| * Updates per comments on PR:ringmaster2014-05-301-2/+2
| * Use 'filesystem_check_enable' as a config option.ringmaster2014-05-271-1/+4
* | fix wordingVolkan Gezer2014-05-301-1/+1
* | Add a warning to the configuration fileLukas Reschke2014-05-291-0/+6
|/
* Add a config option fro setting the filesystem watcher policyRobin Appelman2014-05-231-1/+10
* Merge pull request #8440 from wakeup/masterAndreas Fischer2014-05-031-2/+2
|\
| * Update config.sample.phpVolkan Gezer2014-05-031-1/+1
| * Minor changes in config.sampleVolkan Gezer2014-05-031-2/+2
* | Merge pull request #7852 from josh4trunks/basic_auth_fixThomas Müller2014-04-281-3/+0
|\ \ | |/ |/|
| * Remove missed stuff from mergejosh4trunks2014-04-031-3/+0
| * Fixes login / logout when HTTP Basic Headers are avilable.josh4trunks2014-04-031-3/+3
* | Add another example to the trusted_domains configLukas Reschke2014-04-261-1/+1
* | Preventing access to the config folderLukas Reschke2014-04-241-0/+12
|/
* Allow using "/" in "overwritewebroot"Vincent Petry2014-03-311-1/+1
* Merge pull request #7829 from owncloud/cachefolderlocationVincent Petry2014-03-281-2/+11
|\
| * Cache folder is now configurableVincent Petry2014-03-241-2/+11
* | Log last cron executionkondou2014-03-121-0/+3
|/
* Config to disable basic_auth username chackingkondou2014-02-261-0/+3
* Merge pull request #7259 from owncloud/overwritehost-alwaysLukas Reschke2014-02-221-0/+3
|\
| * 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
|\ \
| * \ Merge pull request #6999 from kofemann/mount-configLukas Reschke2014-02-201-0/+3
| |\ \ | | |/ | |/|
| | * mount: make location of mount.json configurableTigran Mkrtchyan2014-01-291-0/+3
* | | 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.Andreas Fischer2014-01-101-2/+8
* | | Added session_keepalive settingVincent Petry2014-02-041-0/+7
| |/ |/|
* | 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
* add options to disable the check for a working .htaccess file in data and for...Frank Karlitschek2013-10-171-0/+6
* Merge pull request #4780 from AxelRb/masterMorris Jobke2013-10-101-0/+3
|\
| * 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
|\|
| * Merge pull request #4672 from owncloud/ocs_cleanupblizzz2013-09-021-3/+0
| |\
| | * 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
| * | 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