Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Log last cron execution | kondou | 2014-03-12 | 1 | -0/+3 |
| | | | | Fixes #2012 | ||||
* | Config to disable basic_auth username chacking | kondou | 2014-02-26 | 1 | -0/+3 |
| | | | | This can be confusing and/or annoying | ||||
* | Merge pull request #7259 from owncloud/overwritehost-always | Lukas Reschke | 2014-02-22 | 1 | -0/+3 |
|\ | | | | | Add overwritehost config on setup and upgrade | ||||
| * | Add overwritehost config on setup and upgrade | Lukas Reschke | 2014-02-21 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-21 | 1 | -0/+3 |
|\ \ | | | | | | | | | | | | | Conflicts: config/config.sample.php | ||||
| * \ | Merge pull request #6999 from kofemann/mount-config | Lukas Reschke | 2014-02-20 | 1 | -0/+3 |
| |\ \ | | |/ | |/| | mount: make location of mount.json configurable | ||||
| | * | mount: make location of mount.json configurable | Tigran Mkrtchyan | 2014-01-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | do not share users data with config files Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> | ||||
* | | | Indentation | Lukas Reschke | 2014-02-20 | 1 | -2/+2 |
| | | | |||||
* | | | integrate assetic for asset pipeline-ing | Thomas Müller | 2014-02-20 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #6247 from owncloud/memcached-multiple-servers | Andreas Fischer | 2014-02-08 | 1 | -2/+8 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Add support for multiple memcached servers. * owncloud/memcached-multiple-servers: Readd support for memcached_server config variable. Add support for multiple memcached servers. | ||||
| * | | Add support for multiple memcached servers. | Andreas Fischer | 2014-01-10 | 1 | -2/+8 |
| | | | |||||
* | | | Added session_keepalive setting | Vincent Petry | 2014-02-04 | 1 | -0/+7 |
| |/ |/| | | | | | | | When session_keepalive is true (default) the heartbeat will be send as often as the half of the session timeout value. | ||||
* | | updated config.sample.php with mail_from_address parameter | Jens-Christian Fischer | 2014-01-24 | 1 | -0/+6 |
|/ | |||||
* | Document memcached settings in config.sample.php | Andreas Fischer | 2013-12-09 | 1 | -0/+3 |
| | |||||
* | Merge branch 'master' into backgroundscan-reuse-etag | Robin Appelman | 2013-12-06 | 1 | -2/+5 |
|\ | |||||
| * | config switch to disable auto expire for the trash bin | Bjoern Schiessle | 2013-12-04 | 1 | -2/+5 |
| | | |||||
* | | get rid of failing test that don't cause additional downloads | Robin Appelman | 2013-12-06 | 1 | -0/+0 |
|/ | |||||
* | add documentation for single user config option to config.sample.php | Robin Appelman | 2013-11-25 | 1 | -0/+3 |
| | |||||
* | Update config.sample.php | Wikinaut | 2013-11-12 | 1 | -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 Karlitschek | 2013-10-17 | 1 | -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/master | Morris Jobke | 2013-10-10 | 1 | -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 false | Axel Roenn | 2013-10-09 | 1 | -0/+3 |
| | | |||||
* | | let admin specify timezone for log file entries | Bjoern Schiessle | 2013-10-07 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into oc_avatars | kondou | 2013-09-03 | 1 | -3/+5 |
|\| | | | | | | | | | Conflicts: config/config.sample.php | ||||
| * | Merge pull request #4672 from owncloud/ocs_cleanup | blizzz | 2013-09-02 | 1 | -3/+0 |
| |\ | | | | | | | Ocs cleanup | ||||
| | * | remove the config option that is no longer needed | Frank Karlitschek | 2013-08-31 | 1 | -3/+0 |
| | | | |||||
| * | | Employ config option for OpenSSL config file, if provided. | Owen Winkler | 2013-09-02 | 1 | -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 Winkler | 2013-09-02 | 1 | -0/+5 |
| |/ | |||||
* / | Provide 'enable_avatars' in config.php, to disable avatars | kondou | 2013-09-01 | 1 | -0/+3 |
|/ | |||||
* | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 1 | -2/+12 |
|\ | |||||
| * | Only enable logrotate when configured. Also rotate size is settable. | Bart Visscher | 2013-08-28 | 1 | -3/+12 |
| | | |||||
* | | invert logic of disable_previews | Georg Ehrke | 2013-08-29 | 1 | -1/+1 |
| | | |||||
* | | make it possible to disable previews | Georg Ehrke | 2013-08-23 | 1 | -0/+1 |
| | | |||||
* | | style fixes for preview lib | Georg Ehrke | 2013-08-19 | 1 | -0/+2 |
| | | |||||
* | | fix merge conflicts | Georg Ehrke | 2013-08-05 | 1 | -1/+6 |
|\| | |||||
| * | Merge pull request #4293 from owncloud/config-date | Thomas Müller | 2013-08-04 | 1 | -1/+4 |
| |\ | | | | | | | make log date configurable, default to iso 8601 | ||||
| | * | add 'logdateformat' to config.sample.php | Thomas Müller | 2013-08-04 | 1 | -1/+4 |
| | | | |||||
| * | | users's -> user's | Lennart Rosam | 2013-08-02 | 1 | -1/+1 |
| | | | |||||
| * | | Fix typo (again >.<).. gnah | Lennart Rosam | 2013-08-02 | 1 | -1/+1 |
| | | | |||||
| * | | Make default language configurable via config.php | Lennart Rosam | 2013-08-02 | 1 | -1/+4 |
| |/ | |||||
* | | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 1 | -8/+8 |
|\| | | | | | | | | | | | Conflicts: 3rdparty lib/template.php | ||||
| * | reduce time for auto expire to 30 days by default | Björn Schießle | 2013-07-26 | 1 | -2/+2 |
| | | |||||
| * | Fix some typos | kondou | 2013-07-16 | 1 | -6/+6 |
| | | |||||
* | | fix syntax in config.sample.php | Georg Ehrke | 2013-07-29 | 1 | -1/+1 |
| | | |||||
* | | merge conflicts ... | Georg Ehrke | 2013-07-10 | 1 | -0/+3 |
|\| | |||||
| * | session_life_time -> session_lifetime | Thomas Mueller | 2013-06-28 | 1 | -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 value | Thomas Mueller | 2013-06-26 | 1 | -0/+3 |
| | | |||||
* | | yet another update for config.sample.php | Georg Ehrke | 2013-06-05 | 1 | -1/+1 |
| | | |||||
* | | update config.sample.php | Georg Ehrke | 2013-06-05 | 1 | -0/+2 |
| | | |||||
* | | add sample config for previews | Georg Ehrke | 2013-05-25 | 1 | -0/+8 |
|/ |