Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix merge conflicts | Björn Schießle | 2013-01-28 | 1 | -0/+19 |
|\ | |||||
| * | Merge pull request #1318 from j-ed/master | Thomas Müller | 2013-01-28 | 1 | -0/+4 |
| |\ | | | | | | | added parameter mail_smtpauthtype to set SMTP authentication type. | ||||
| | * | Update config/config.sample.php | j-ed | 2013-01-26 | 1 | -0/+4 |
| | | | | | | | | | added parameter mail_smtpauthtype to set SMTP authentication type. | ||||
| * | | Warn users not to enable DEBUG in productive environments | Lukas Reschke | 2013-01-25 | 1 | -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-js | Lukas Reschke | 2013-01-25 | 1 | -0/+10 |
| |\| | |||||
| | * | Update config/config.sample.php | j-ed | 2013-01-22 | 1 | -2/+2 |
| | | | | | | | | | fixed an other typo. | ||||
| | * | Update config/config.sample.php | j-ed | 2013-01-22 | 1 | -1/+1 |
| | | | | | | | | | Fixed type in line 70. Thank you for pointing me to that typo. | ||||
| | * | Update config/config.sample.php | j-ed | 2013-01-22 | 1 | -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 images | Lukas Reschke | 2013-01-25 | 1 | -1/+1 |
| | | | |||||
| * | | Allow admins to change the CSP policy in the config file | Lukas Reschke | 2013-01-23 | 1 | -0/+3 |
| |/ | |||||
* | | fix typo in comment | Björn Schießle | 2013-01-22 | 1 | -1/+1 |
| | | |||||
* | | allow admin to change retention obligation for the trash bin, default value ↵ | Björn Schießle | 2013-01-22 | 1 | -0/+3 |
|/ | | | | is 180 days | ||||
* | Spaces to tabs | Bart Visscher | 2013-01-16 | 1 | -8/+8 |
| | |||||
* | Enhanced auth is totally unmaintained and broken | Lukas Reschke | 2013-01-14 | 1 | -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.php | Michael Gapczynski | 2013-01-04 | 1 | -0/+3 |
| | |||||
* | add smtp port configuration option | Thomas Mueller | 2013-01-02 | 1 | -0/+3 |
| | |||||
* | call it "proxy" instead of "curlproxy" | root | 2012-12-19 | 1 | -2/+2 |
| | | | | | Thanks Bart for the hint. This also switches "==" to "<>" and not the code actually works ;-) | ||||
* | add curl proxy support. Fixes #504 | Frank Karlitschek | 2012-12-19 | 1 | -0/+6 |
| | | | | https://github.com/owncloud/core/issues/504 | ||||
* | add sample configuration for user backends | Robin Appelman | 2012-11-25 | 1 | -0/+6 |
| | |||||
* | make it possible to manually override the hostname and protocol if the ↵ | Frank Karlitschek | 2012-11-22 | 1 | -0/+6 |
| | | | | automatic detection from ownCloud fails. This can happen in reverse proxy situations or with loadbalancers setups. | ||||
* | Merge pull request #31 from visit1985/persistentcookies | Lukas Reschke | 2012-10-16 | 1 | -1/+4 |
|\ | | | | | reresubmit: improved persistent cookies :) | ||||
| * | Make the lifetime of the remember login cookie | Bart Visscher | 2012-10-14 | 1 | -1/+4 |
| | | |||||
* | | Make enhanced auth configurable | Lukas Reschke | 2012-10-16 | 1 | -0/+3 |
| | | |||||
* | | Make enhanced auth time configurable | Lukas Reschke | 2012-10-16 | 1 | -0/+3 |
|/ | |||||
* | Correct "ownCloud" | Lukas Reschke | 2012-09-23 | 1 | -10/+9 |
| | |||||
* | Add little more doc about app folders | Brice Maron | 2012-06-21 | 1 | -0/+1 |
| | |||||
* | Correct sample config | Brice Maron | 2012-06-14 | 1 | -8/+4 |
| | |||||
* | Merge branch 'master' into multi_app_dir | Brice Maron | 2012-06-14 | 1 | -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 Karlitschek | 2012-06-09 | 1 | -0/+3 |
| | | | | | | | | more tricky. | ||||
| * | generate a random salt during installation and store it in the config.php. ↵ | Frank Karlitschek | 2012-06-08 | 1 | -0/+3 |
| | | | | | | | | use it to salt the password hashing. | ||||
| * | add spacing lines to our awesome new sample config file. readability++ | Frank Karlitschek | 2012-06-08 | 1 | -0/+26 |
| | | |||||
| * | Add help texts to config options in config.sample.php | Bart Visscher | 2012-06-07 | 1 | -4/+33 |
| | | |||||
* | | Add possibility to choose the installation folder | Brice Maron | 2012-06-14 | 1 | -6/+6 |
| | | |||||
* | | Add doc about multi app dir in sample config | Brice Maron | 2012-06-07 | 1 | -1/+12 |
|/ | |||||
* | Make check for writable apps dir configurable | Bart Visscher | 2012-06-05 | 1 | -0/+5 |
| | |||||
* | fix oc-780 | Frank Karlitschek | 2012-05-31 | 1 | -1/+1 |
| | |||||
* | make default app choosable | Georg Ehrke | 2012-05-11 | 1 | -0/+1 |
| | |||||
* | removing executable bit from various files | Thomas Mueller | 2012-04-30 | 1 | -0/+0 |
| | |||||
* | document the log settings | Frank Karlitschek | 2012-04-21 | 1 | -0/+3 |
| | |||||
* | Add a static code checker for evil patterns in apps. | Frank Karlitschek | 2012-04-21 | 1 | -0/+1 |
| | | | | | Disabled by default for now. We will check for private api calls here later once the public api is in place | ||||
* | new OC_Mail class to handle all mail sending. The benefit is that is way mor ↵ | Frank Karlitschek | 2012-04-20 | 1 | -0/+5 |
| | | | | flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code | ||||
* | make it possible to connect to other ocs appstores and other ocs ↵ | Frank Karlitschek | 2012-03-23 | 1 | -0/+4 |
| | | | | | | knowledgebase servers. also make it possible to switch the app store and the knowledgebase off completely. | ||||
* | make the location of the 3rdparty folder flexible. | Frank Karlitschek | 2012-02-23 | 1 | -0/+2 |
| | | | | | It´s automatically search in the owncloud folder and in the parent folder. override with an option in config.php is also possible | ||||
* | add themeing support and support for autoselection of mobile/tablet and ↵ | Frank Karlitschek | 2012-02-11 | 1 | -0/+1 |
| | | | | standalone css/jss files and templates | ||||
* | only call error_log() if DEBUG is true | Florian Pritz | 2011-09-24 | 1 | -0/+2 |
| | | | | Signed-off-by: Florian Pritz <bluewind@xinu.at> | ||||
* | merged gitignores | Jan-Christoph Borchardt | 2011-08-15 | 1 | -2/+0 |
| | |||||
* | Adding clear logs functions | Alessandro Cosentino | 2011-06-07 | 1 | -0/+0 |
| | |||||
* | Use OC_CONFIG where possible | Jakob Sack | 2011-04-16 | 1 | -11/+14 |
| | |||||
* | fix permissions, start to implement private data api | Martin T. H. Sandsmark | 2010-07-16 | 2 | -0/+0 |
| | |||||
* | Merge commit 'refs/merge-requests/27' of ↵ | Robin Appelman | 2010-07-05 | 2 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/owncloud/owncloud into merge Conflicts: inc/HTTP/WebDAV/Server/Filesystem.php inc/lib_config.php inc/lib_log.php inc/lib_user.php inc/templates/adminform.php |