summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/
* fixes #2789 - no internet connectivity check if there is non on purposeThomas Mueller2013-04-081-1/+4
|
* Update config.sample.phpFrank Karlitschek2013-04-051-2/+2
| | | clarify documentation. Fixes https://github.com/owncloud/core/issues/2624 
* Change logQuery from define() to OC::ConfigBrice Maron2013-03-301-0/+4
|
* fix missing ',' after "mail_domain" parameteritheiss2013-03-261-1/+1
|
* Update to reflect new parameter mail_domainitheiss2013-03-261-0/+3
| | | see #2568
* Remove uneeded \ since we're using "Lukas Reschke2013-03-021-1/+1
|
* add switch to enable/disable the possibility to change the display name by ↵Björn Schießle2013-02-101-0/+3
| | | | the user
* make it possible to modify the links to the clientsGeorg Ehrke2013-02-061-1/+5
|
* Merge pull request #1445 from owncloud/CSP_fontThomas Müller2013-02-041-1/+1
|\ | | | | Allow loading of external fonts
| * Also allow local filesLukas Reschke2013-02-041-1/+1
| |
| * Allow the loading of local font files embedded via data:Lukas Reschke2013-02-041-1/+1
| |
| * Allow loading of external fontsLukas Reschke2013-02-041-1/+1
| | | | | | | | Required by several applications like our pdf viewer
* | Make fileblacklist configurableLukas Reschke2013-02-031-0/+3
|/
* add SSL proxy supportherbrechtsmeier2013-01-311-0/+3
| | | | | | | | | Add support for a reverse proxy that only forwards SSL connections unencrypted to the web server. This patch allows to detect the reverse proxy via regular expression for the remote IP address and conditional overwrite the host name, protocol and web root.
* add multiple domains reverse proxy supportStefan Herbrechtsmeier2013-01-311-0/+3
| | | | | | | | | | | | Add support for a reverse proxy that handles multiple domains via different web roots (http[s]://proxy.tld/domain.tld/owncloud). As the reverse proxy web root is transparent for the web server the REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace the direct use of this _SERVER variables with function calls and extend this functions to overwrite the web root. Additionally it adds a Sabre request backend that extends the Sabre_HTTP_Request to use the same functions.
* fix merge conflictsBjörn Schießle2013-01-281-0/+19
|\