summaryrefslogtreecommitdiffstats
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Merge pull request #1318 from j-ed/masterThomas Müller2013-01-281-0/+4
| |\ | | | | | | added parameter mail_smtpauthtype to set SMTP authentication type.
| | * Update config/config.sample.phpj-ed2013-01-261-0/+4
| | | | | | | | | added parameter mail_smtpauthtype to set SMTP authentication type.
| * | Warn users not to enable DEBUG in productive environmentsLukas Reschke2013-01-251-0/+2
| | | | | | | | | The debug mode should not be enabled in productive environments and is also a security risk since some apps outputs unsanitized debug data to the template.
| * | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-251-0/+10
| |\|
| | * Update config/config.sample.phpj-ed2013-01-221-2/+2
| | | | | | | | | fixed an other typo.
| | * Update config/config.sample.phpj-ed2013-01-221-1/+1
| | | | | | | | | Fixed type in line 70. Thank you for pointing me to that typo.
| | * Update config/config.sample.phpj-ed2013-01-221-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Added three additional mail_smtp.. parameters. - mail_smtpdebug - enable debug messages to analyse SMTP problems. - mail_smtptimeout - set SMTP timeout which is set to 10s by default and this is sometimes to short especially if a malware/ spam scanner is used. - mail_smtpsecure - force secure SMTP connections.
| * | Allow the loading of external imagesLukas Reschke2013-01-251-1/+1
| | |
| * | Allow admins to change the CSP policy in the config fileLukas Reschke2013-01-231-0/+3
| |/
* | fix typo in commentBjörn Schießle2013-01-221-1/+1
| |
* | allow admin to change retention obligation for the trash bin, default value ↵Björn Schießle2013-01-221-0/+3
|/ | | | is 180 days
* Spaces to tabsBart Visscher2013-01-161-8/+8
|
* Enhanced auth is totally unmaintained and brokenLukas Reschke2013-01-141-6/+0
| | | | | | Let's remove it, it's also not secure anymore with the introduction of our API etc... (And doesn't work with ldap etc…)
* Add maintenance mode entry to config.sample.phpMichael Gapczynski2013-01-041-0/+3
|
* add smtp port configuration optionThomas Mueller2013-01-021-0/+3
|
* call it "proxy" instead of "curlproxy"root2012-12-191-2/+2
| | | | | Thanks Bart for the hint. This also switches "==" to "<>" and not the code actually works ;-)
* add curl proxy support. Fixes #504Frank Karlitschek2012-12-191-0/+6
| | | | https://github.com/owncloud/core/issues/504
* add sample configuration for user backendsRobin Appelman2012-11-251-0/+6
|
* make it possible to manually override the hostname and protocol if the ↵Frank Karlitschek2012-11-221-0/+6
| | | | automatic detection from ownCloud fails. This can happen in reverse proxy situations or with loadbalancers setups.
* Merge pull request #31 from visit1985/persistentcookiesLukas Reschke2012-10-161-1/+4
|\ | | | | reresubmit: improved persistent cookies :)
| * Make the lifetime of the remember login cookieBart Visscher2012-10-141-1/+4
| |
* | Make enhanced auth configurableLukas Reschke2012-10-161-0/+3
| |
* | Make enhanced auth time configurableLukas Reschke2012-10-161-0/+3
|/
* Correct "ownCloud"Lukas Reschke2012-09-231-10/+9
|
* Add little more doc about app foldersBrice Maron2012-06-211-0/+1
|
* Correct sample configBrice Maron2012-06-141-8/+4
|
* Merge branch 'master' into multi_app_dirBrice Maron2012-06-141-4/+65
|\ | | | | | | | | | | | | | | Conflicts: apps/bookmarks/ajax/addBookmark.php config/config.sample.php lib/app.php remote.php
| * finally fix the updater. next is an automatic updater. but this is a bit ↵Frank Karlitschek2012-06-091-0/+3
| | | | | | | | more tricky.
| * generate a random salt during installation and store it in the config.php. ↵Frank Karlitschek2012-06-081-0/+3
| | | | | | | | use it to salt the password hashing.
| * add spacing lines to our awesome new sample config file. readability++Frank Karlitschek2012-06-081-0/+26
| |
| * Add help texts to config options in config.sample.phpBart Visscher2012-06-071-4/+33
| |