aboutsummaryrefslogtreecommitdiffstats
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into securityutilsLukas Reschke2014-08-311-0/+6
|\
| * Add support for getting the real client IP behind proxiesLukas Reschke2014-08-271-0/+6
* | Add some security utilitiesLukas Reschke2014-08-271-0/+3
|/
* Merge pull request #9818 from owncloud/fix-mount-file-configRobin McCorkell2014-08-241-1/+1
|\
| * Comment out mount_file config optionRobin McCorkell2014-08-201-1/+1
* | Merge pull request #10409 from owncloud/iShallNotCopyStuffWithoutThinkingLukas Reschke2014-08-191-0/+4
|\ \
| * | Add a copied_sample_config switchLukas Reschke2014-08-191-0/+4
* | | Merge pull request #10425 from owncloud/set_default_share_folderBjörn Schießle2014-08-191-0/+5
|\ \ \
| * | | make share folder configurableBjoern Schiessle2014-08-181-0/+5
| |/ /
* | | Make skeleton directory configurable.Stefan Rado2014-08-161-0/+5
* | | Move authentication failed logging to checkPasswordLukas Reschke2014-08-151-3/+0
|/ /
* / support aes 256Bjoern Schiessle2014-07-231-0/+3
|/
* update appstore api urlFrank Karlitschek2014-07-171-1/+1
* Add comment to overwrite* configs about CLI/cron problemsJoas Schilling2014-07-071-4/+4
* Support for multiple default appsVincent Petry2014-07-011-1/+5
* add disclaimer to objectstore example configJörn Friedrich Dreyer2014-06-231-1/+5
* add autocreate config option for containers, implement autocreate and delete ...Jörn Friedrich Dreyer2014-06-181-0/+1
* add 'objectstore' configuration exampleJörn Friedrich Dreyer2014-06-181-0/+23
* if file doesn't exist, check parent folderBjoern Schiessle2014-06-141-0/+0
* Merge pull request #9018 from owncloud/dbms-socket-supportFrank Karlitschek2014-06-131-1/+1
|\
| * Update notes on dbhostjosh4trunks2014-06-051-1/+1
* | Added experimental switch to count external storage data in quotaVincent Petry2014-06-041-1/+3
|/
* 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