summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Clarify possible preview providers for type OfficeLukas Reschke2014-09-251-1/+5
| | | | | | | a Conflicts: lib/private/preview.php
* Merge branch 'stable6' into backport-11211-stable6Lukas Reschke2014-09-231-1/+1
|\ | | | | | | | | Conflicts: config/config.sample.php
| * Use non-empty defaultsVictor Dubiniuk2014-09-231-1/+1
| |
* | Add a configuration switch for enabled preview mimetypesLukas Reschke2014-09-231-0/+21
|/ | | | Backport of https://github.com/owncloud/core/pull/11211 to stable6
* Revert "Reword the description"Lukas Reschke2014-09-161-3/+3
| | | | This reverts commit 16c5925155bfd6c7cc35745b233b0739fb513f51.
* Reword the descriptionLukas Reschke2014-09-161-3/+3
| | | | | | The old one was just horrible wrong. Conflicts: config/config.sample.php
* Minor changes in config.sampleVolkan Gezer2014-08-131-2/+2
| | | | | | | * appcodechecker accepts boolean. * using different ports in trusted domains Partially fixes #330
* [backport] [stable6] Skip filescan but execute hooksringmaster2014-06-031-0/+3
| | | | Backport of #8607
* Add another example to the trusted_domains configLukas Reschke2014-04-261-1/+1
| | | | | Users often ask in IRC or the forum how to add another domain. Hopefully they will be able to find it out on their own if we have an example with two domains.
* Add overwritehost config on setup and upgradeLukas Reschke2014-02-221-0/+3
|
* Added session_keepalive settingVincent Petry2014-02-051-0/+7
| | | | | | | When session_keepalive is true (default) the heartbeat will be send as often as the half of the session timeout value. Backport of 912da8d to stable6
* Document memcached settings in config.sample.phpv6.0.0Andreas Fischer2013-12-091-0/+3
|
* get rid of failing test that don't cause additional downloadsRobin Appelman2013-12-061-0/+0
|
* config switch to disable auto expire for the trash binBjoern Schiessle2013-12-041-2/+5
|
* 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
|/
* Merge pull request #3111 from owncloud/csp-audioicewind19912013-04-241-1/+1
|\ | | | | Allow loading of external media ressources
| * Allow loading of external media ressourcesLukas Reschke2013-04-241-1/+1
| |
* | - xframe restriction configurable nowFlorian Scholz2013-04-241-0/+4
|/
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-21 11:22:43 +0000