Commit graph

34 commits

Author SHA1 Message Date
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Michael Gapczynski
f2ca7023e1 Fix Shared root problems with Watcher and Quota proxy 2013-01-01 11:19:33 -05:00
Robin Appelman
bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Jörn Friedrich Dreyer
c5ba4f476a fix quota off by one error 2012-11-09 14:34:15 +01:00
Robin Appelman
46071fed80 fix quota proxy 2012-11-08 21:35:40 +01:00
Robin Appelman
961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +01:00
Felix Moeller
0e70ea9d8b Checkstyle: Fix the last 25 NoSpaceAfterComma 2012-11-04 18:28:29 +01:00
Felix Moeller
30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller
f8d1d7787e Checkstyle fixes for SpaceBeforeOpenBrace 2012-11-04 10:46:32 +01:00
Felix Moeller
afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Robin Appelman
9953427197 also use new cache api here 2012-10-26 23:26:12 +02:00
Robin Appelman
6db81afab9 move some stuff to the new api 2012-10-26 23:05:02 +02:00
Robin Appelman
7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
icewind1991
ab944094e2 Merge pull request #12 from scambra/fixes
check free space using folder's owner
2012-10-23 07:02:21 -07:00
Robin Appelman
77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Bart Visscher
4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Robin Appelman
11e9ce25e6 merge master into filesystem 2012-10-13 04:29:20 +02:00
Björn Schießle
d4fd83301a remove unneeded variable 2012-10-12 16:33:57 +02:00
Björn Schießle
cb91e27ab3 check if directory already exist before executing mkdir 2012-10-12 16:31:03 +02:00
Robin Appelman
aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
scambra
2b5133a1c4 check free space using folder's owner 2012-09-19 21:31:29 +02:00
Robin Appelman
2a8ff8a0d4 fix problem with quota proxy when using copy 2012-09-17 22:16:07 +02:00
Thomas Mueller
3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher
52f2e7112e Whitespace fixes in lib 2012-08-29 20:28:45 +02:00
Michael Gapczynski
cc3835d657 Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache
Conflicts:

	lib/fileproxy/quota.php
2012-06-20 19:39:17 -04:00
Bjoern Schiessle
0469f529fa quota calculation fixed 2012-06-19 09:35:13 +02:00
Bjoern Schiessle
d496a5e19f ignore "Shared"-directory when calculating free space 2012-06-18 17:23:54 +02:00
Robin Appelman
f06c08a637 cleanup oc_filecache, splitting it in several parts and using the new hasUpdated 2012-06-15 19:56:15 +02:00
Robin Appelman
9f5bce81b0 add a default user quota 2012-02-24 23:54:38 +01:00
Robin Appelman
835d6a9b6e save quota in human readable format (42 MB), should prevent some of the overflow related problems 2011-12-14 01:16:14 +01:00
Robin Appelman
57bffdb46a fix uploading files using webdav 2011-09-25 01:20:43 +02:00
Florian Pritz
36c31b0e83 fix warning when uploading file using webdav
When uploading a file using davfs php warned about a missing argument to
OC_FileProxy_Quota::preFile_put_contents(). Since we get a resource from
OC_Connector_Sabre_File->put(), we have to convert that before running
strlen because it expects a string.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:42:01 +02:00
Robin Appelman
6173c0fbc2 a bit of refactoring for oc_filesystem and implement user quota 2011-08-15 21:09:13 +02:00