Thomas Müller 7279a07ca2 Merge branch 'master' into mimetype-defaults ...

Conflicts:
	apps/files/ajax/newfile.php

2013-08-16 00:13:10 +02:00

..

cache

Scanner: correctly pass trough reuse options when doing a recursive scan

2013-08-12 15:37:39 +02:00

mount

manage creating and wrapping storages in it's own class

2013-06-07 17:07:13 +02:00

storage

Merge pull request #3763 from owncloud/recursive-rmdir

2013-06-30 09:16:32 -07:00

stream

fix is_file and is_dir for the static streamwrapper

2013-06-28 19:54:16 +02:00

type

use ===

2013-08-07 17:17:30 +02:00

utils

remove unneeded 'use'

2013-07-29 17:04:28 +02:00

filesystem.php

add option to get the mountmanager from the filesystem

2013-07-19 16:33:00 +02:00

mapper.php

Merge pull request #3690 from owncloud/use_execute_audited_in_filecache

2013-06-13 13:55:55 -07:00

view.php

don't run hooks for .part files

2013-07-03 10:11:50 +02:00