Commit Graph

104 Commits

Author SHA1 Message Date
Andreas Fischer 5db73c05fb Document memcached settings in config.sample.php 2013-12-09 01:20:10 +01:00
Robin Appelman 9eca2471b3 Merge branch 'master' into backgroundscan-reuse-etag 2013-12-06 18:27:46 +01:00
Robin Appelman e888bdda30 get rid of failing test that don't cause additional downloads 2013-12-06 18:26:38 +01:00
Bjoern Schiessle 6b7fdda4f5 config switch to disable auto expire for the trash bin 2013-12-04 16:11:40 +01:00
Robin Appelman a609a53647 add documentation for single user config option to config.sample.php 2013-11-25 16:01:42 +01:00
Wikinaut 63952aaeab Update config.sample.php
/* 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.
*/
2013-11-12 00:59:35 +01:00
Frank Karlitschek 6a60a47d59 add options to disable the check for a working .htaccess file in data and 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. 2013-10-17 16:27:43 +02:00
Morris Jobke 0641365a10 Merge pull request #4780 from AxelRb/master
On an auth failure the uid and the IP address should be logged to the st...
2013-10-10 07:21:36 -07:00
Axel Roenn 08a0435704 Added the config option to log ip addresses , default false 2013-10-09 17:21:35 +02:00
Bjoern Schiessle 6a411833b9 let admin specify timezone for log file entries 2013-10-07 15:34:48 +02:00
kondou 65413a95dc Merge branch 'master' into oc_avatars
Conflicts:
	config/config.sample.php
2013-09-03 04:43:11 +02:00
blizzz 431cf06e99 Merge pull request #4672 from owncloud/ocs_cleanup
Ocs cleanup
2013-09-02 14:24:46 -07:00
Owen Winkler 9a263a500a Employ config option for OpenSSL config file, if provided.
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.
2013-09-02 09:59:00 -04:00
Owen Winkler fb34f49913 Start a branch for easier OpenSSL configuration. 2013-09-02 09:58:19 -04:00
kondou 76b1b5b6a3 Provide 'enable_avatars' in config.php, to disable avatars 2013-09-01 18:17:14 +02:00
Frank Karlitschek a5633bb155 remove the config option that is no longer needed 2013-08-31 18:03:10 +02:00
Georg Ehrke b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
Georg Ehrke 70b6e2161e invert logic of disable_previews 2013-08-29 10:08:53 +02:00
Bart Visscher 3fd2df4088 Only enable logrotate when configured. Also rotate size is settable. 2013-08-28 17:41:27 +02:00
Georg Ehrke 1dab076750 make it possible to disable previews 2013-08-23 23:05:44 +02:00
Georg Ehrke 48f0c54261 style fixes for preview lib 2013-08-19 12:16:55 +02:00
Georg Ehrke af983b843d fix merge conflicts 2013-08-05 14:27:38 +02:00
Thomas Müller d1a39ab01c Merge pull request #4293 from owncloud/config-date
make log date configurable, default to iso 8601
2013-08-04 15:18:05 -07:00
Thomas Müller ad952f215d add 'logdateformat' to config.sample.php 2013-08-04 23:13:19 +02:00
Lennart Rosam ad329f541b users's -> user's 2013-08-02 11:19:33 +02:00
Lennart Rosam 504beb6cfd Fix typo (again >.<).. gnah 2013-08-02 10:01:34 +02:00
Lennart Rosam 79351d064f Make default language configurable via config.php 2013-08-02 09:41:31 +02:00
Thomas Müller 7425efade7 Merge branch 'master' into oc_preview
Conflicts:
	3rdparty
	lib/template.php
2013-07-30 00:34:36 +02:00
Georg Ehrke b4a5239278 fix syntax in config.sample.php 2013-07-29 16:30:04 +02:00
Björn Schießle 0a9bb8ba73 reduce time for auto expire to 30 days by default 2013-07-26 15:15:47 +02:00
kondou d9c697534d Fix some typos 2013-07-16 06:01:26 +02:00
Georg Ehrke a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Thomas Mueller 3b91ce695f session_life_time -> session_lifetime
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
2013-06-28 15:17:54 +02:00
Thomas Mueller 794c189650 session life time is now configurable and set to the same value 2013-06-26 09:21:38 +02:00
Georg Ehrke 5c1d4fc186 yet another update for config.sample.php 2013-06-05 11:18:57 +02:00
Georg Ehrke 78e8712366 update config.sample.php 2013-06-05 11:17:29 +02:00
Georg Ehrke 1bed3253ab add sample config for previews 2013-05-25 11:05:37 +02:00
icewind1991 3b576c5f77 Merge pull request #3111 from owncloud/csp-audio
Allow loading of external media ressources
2013-04-24 08:17:42 -07:00
Lukas Reschke 4f96d7fb85 Allow loading of external media ressources 2013-04-24 16:45:51 +02:00
Florian Scholz 03aa86d8a6 - xframe restriction configurable now 2013-04-24 14:45:40 +02:00
Thomas Mueller 46722d8282 fixes #2789 - no internet connectivity check if there is non on purpose 2013-04-08 22:41:20 +02:00
Frank Karlitschek adb8197c0b Update config.sample.php
clarify documentation. Fixes https://github.com/owncloud/core/issues/2624
2013-04-05 13:44:49 +03:00
Brice Maron 63804f4153 Change logQuery from define() to OC::Config 2013-03-30 22:36:55 +01:00
itheiss f0733b2cb5 fix missing ',' after "mail_domain" parameter 2013-03-26 10:37:07 +01:00
itheiss 02d53deecc Update to reflect new parameter mail_domain
see #2568
2013-03-26 09:49:51 +01:00
Lukas Reschke 50460d9032 Remove uneeded \ since we're using " 2013-03-02 00:04:44 +01:00
Björn Schießle d8fee28b3b add switch to enable/disable the possibility to change the display name by the user 2013-02-10 14:43:31 +01:00
Georg Ehrke 0a16d25724 make it possible to modify the links to the clients 2013-02-06 15:20:43 +01:00
Thomas Müller f04a91bd60 Merge pull request #1445 from owncloud/CSP_font
Allow loading of external fonts
2013-02-04 10:36:43 -08:00
Lukas Reschke 5fcb35efd6 Also allow local files 2013-02-04 18:43:26 +01:00