da6aae28ad
Merge pull request #8607 from owncloud/filescan_app_hook
...
Allow apps to control via a hook skipping add/remove a file during filescan
2014-05-30 12:38:37 -04:00
bb8ee2e9af
fix wording
2014-05-30 16:00:57 +02:00
16ae63bdfd
Updates per comments on PR:
...
* Use "filesystem_cache_readonly" config setting, update comment in config.sample
* Use $this->cacheActive to cache config setting
* Add public Scanner::setCacheActive() to set $cacheActive programmatically
2014-05-30 09:42:41 -04:00
62eb5cd6b0
Add a warning to the configuration file
...
Some people believe that they should copy the sample config to the "real" config. I noticed this several times in IRC and on the bugtracker.
I guess this warning should be enough to avoid this in the future.
2014-05-29 17:43:59 +02:00
26d169b27c
Use 'filesystem_check_enable' as a config option.
2014-05-27 16:01:16 -04:00
151c48494e
Add a config option fro setting the filesystem watcher policy
2014-05-23 12:20:31 +02:00
e381d7d180
Merge pull request #8440 from wakeup/master
...
Minor changes in config.sample
* wakeup/master:
Update config.sample.php
Minor changes in config.sample
2014-05-03 23:39:10 +02:00
1a0fc49018
Update config.sample.php
2014-05-03 15:38:44 +02:00
6dfc63a240
Minor changes in config.sample
...
* appcodechecker accepts boolean.
* using different ports in trusted domains
Partially fixes #330
2014-05-03 14:41:36 +02:00
7c0340c63c
Merge pull request #7852 from josh4trunks/basic_auth_fix
...
Fixes login / logout when HTTP Basic Headers are avilable.
2014-04-28 21:46:52 +02:00
2bea7ec2e7
Add another example to the trusted_domains config
...
Users often ask in IRC or the forum how to add another domain.
Hopefully they will be able to find it out on their own if we have an example with two domains.
2014-04-26 22:37:30 +02:00
2d9b46e3b9
Remove missed stuff from merge
2014-04-03 22:17:31 -07:00
4ddf5d92f2
Fixes login / logout when HTTP Basic Headers are avilable.
2014-04-03 22:12:57 -07:00
cf361b6b4a
Allow using "/" in "overwritewebroot"
...
Whenever the reverse proxy is using "/" as the webroot, it is now
possible to set that value in "overwritewebroot"
2014-03-31 15:36:48 +02:00
040f430f0c
Merge pull request #7829 from owncloud/cachefolderlocation
...
Cache folder is now configurable
2014-03-28 12:08:38 +01:00
10c9b8eb99
Cache folder is now configurable
...
When using an external cache folder, it is automatically mounted in
FileSystem::initFileSystem so that any app can use it transparently
by creating a view on the "/$user/cache" directory.
2014-03-24 12:57:11 +01:00
547b563464
Log last cron execution
...
Fixes #2012
2014-03-12 15:20:51 +01:00
da19109f40
Config to disable basic_auth username chacking
...
This can be confusing and/or annoying
2014-02-26 18:06:13 +01:00
c9ab11a9bd
Merge pull request #7259 from owncloud/overwritehost-always
...
Add overwritehost config on setup and upgrade
2014-02-22 07:35:56 +01:00
fe44ac264b
Add overwritehost config on setup and upgrade
2014-02-21 15:19:01 +01:00
f19276f7bc
Merge branch 'master' into no-css-js-delivery-via-php
...
Conflicts:
config/config.sample.php
2014-02-21 09:51:51 +01:00
c869e0116b
Merge pull request #6999 from kofemann/mount-config
...
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
2955d9b483
Indentation
2014-02-20 13:54:05 +01:00
8cf73ca42f
integrate assetic for asset pipeline-ing
2014-02-20 13:28:27 +01:00
bbfd97ce03
Merge pull request #6247 from owncloud/memcached-multiple-servers
...
Add support for multiple memcached servers.
* owncloud/memcached-multiple-servers:
Readd support for memcached_server config variable.
Add support for multiple memcached servers.
2014-02-08 14:21:19 +01:00
912da8d277
Added session_keepalive setting
...
When session_keepalive is true (default) the heartbeat will be send as
often as the half of the session timeout value.
2014-02-04 13:56:10 +01:00
8cc9727520
mount: make location of mount.json configurable
...
do not share users data with config files
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-29 17:14:23 +01:00
3ca85cd841
updated config.sample.php with mail_from_address parameter
2014-01-24 16:24:52 +01:00
320353c237
Add support for multiple memcached servers.
2014-01-10 00:57:34 +01:00
5db73c05fb
Document memcached settings in config.sample.php
2013-12-09 01:20:10 +01:00
9eca2471b3
Merge branch 'master' into backgroundscan-reuse-etag
2013-12-06 18:27:46 +01:00
e888bdda30
get rid of failing test that don't cause additional downloads
2013-12-06 18:26:38 +01:00
6b7fdda4f5
config switch to disable auto expire for the trash bin
2013-12-04 16:11:40 +01:00
a609a53647
add documentation for single user config option to config.sample.php
2013-11-25 16:01:42 +01:00
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
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
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
08a0435704
Added the config option to log ip addresses , default false
2013-10-09 17:21:35 +02:00
6a411833b9
let admin specify timezone for log file entries
2013-10-07 15:34:48 +02:00
65413a95dc
Merge branch 'master' into oc_avatars
...
Conflicts:
config/config.sample.php
2013-09-03 04:43:11 +02:00
431cf06e99
Merge pull request #4672 from owncloud/ocs_cleanup
...
Ocs cleanup
2013-09-02 14:24:46 -07:00
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
fb34f49913
Start a branch for easier OpenSSL configuration.
2013-09-02 09:58:19 -04:00
76b1b5b6a3
Provide 'enable_avatars' in config.php, to disable avatars
2013-09-01 18:17:14 +02:00
a5633bb155
remove the config option that is no longer needed
2013-08-31 18:03:10 +02:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
70b6e2161e
invert logic of disable_previews
2013-08-29 10:08:53 +02:00
3fd2df4088
Only enable logrotate when configured. Also rotate size is settable.
2013-08-28 17:41:27 +02:00
1dab076750
make it possible to disable previews
2013-08-23 23:05:44 +02:00
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
Owen Winkler
Volkan Gezer
ringmaster
Lukas Reschke
Robin Appelman
Andreas Fischer
Thomas Müller
josh4trunks
Vincent Petry
kondou
Tigran Mkrtchyan
Jens-Christian Fischer
Bjoern Schiessle
Wikinaut
Frank Karlitschek
Morris Jobke
Axel Roenn
blizzz
Georg Ehrke
Bart Visscher