Commit Graph

105 Commits

Author SHA1 Message Date
Thomas Müller f31d0ce87c
Merge branch 'master' of https://github.com/d--j/core into d--j-master 2016-04-25 14:52:38 +02:00
Thomas Müller ab690371b7
Merge branch 'patch-1' of https://github.com/weits/core into weits-patch-1 2016-04-25 14:49:49 +02:00
Robin Appelman 21643150aa error out if a local storage isn't setup correctly 2016-04-25 14:36:53 +02:00
Robin Appelman 4ac16001e0
add locks in the scanner to prevent multiple scanners running on the same files 2016-04-25 11:09:08 +02:00
Roeland Jago Douma dedf392751
Move \OC\Files to PSR-4 2016-04-24 21:37:35 +02:00