Commit graph

276 commits

Author SHA1 Message Date
Thomas Müller
fa3a65aea7 Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend
file system is now initialized with apache authentication as well
2013-10-16 04:23:45 -07:00
Thomas Müller
5318df3b3c there shall be tabs 2013-10-14 14:51:25 +02:00
Thomas Müller
fb3829e8b8 file system is now initialized with apache authentication as well 2013-10-14 14:46:43 +02:00
Thomas Müller
a5e808defc Merge branch 'master' into fixing-4546-master
Conflicts:
	lib/private/connector/sabre/file.php
2013-10-14 10:56:50 +02:00
Thomas Müller
dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
Thomas Müller
27738fc4f5 due to internal implementations touch will always be successful - $mtime will be stored in the cache
from desktop client perspective it is necessary to set the mtime under every condition
2013-10-09 15:35:09 +02:00
Thomas Müller
3f27fefdbe fixing status code and formatting 2013-10-08 15:40:42 +02:00
Thomas Müller
e7e53363ac Merge pull request #5194 from owncloud/fixing-5172-master
adding check isDeletable() on $sourcePath
2013-10-08 06:18:29 -07:00
Thomas Müller
caa27824a9 catch specific file exceptions and convert them to proper http status code via webdav 2013-10-08 15:04:31 +02:00
Bjoern Schiessle
6c45fab037 part file needs to have .part extension 2013-10-08 12:00:32 +02:00
Thomas Müller
c77f74e1de adding check isDeletable() on $sourcePath 2013-10-08 11:43:44 +02:00
Bjoern Schiessle
dd202d9ad3 updating a existing large file creates new file chunks. Therefore createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file" 2013-10-08 11:27:08 +02:00
Bjoern Schiessle
0293d8e04f If a existing file in Shared/ with update permissions gets updated we need to write the .part file to a different place because we can't create new files in the Shared folder 2013-10-08 11:26:49 +02:00
Thomas Müller
61a534fb60 moving createFileChunked() to OC_Connector_Sabre_File 2013-10-07 17:49:21 +02:00
Thomas Müller
5e397d89c4 Merge branch 'master' into fixing-4546-master
Conflicts:
	lib/private/connector/sabre/directory.php
2013-10-07 17:47:54 +02:00
Thomas Müller
f496609085 the path for reassembling was created the wrong way 2013-10-07 17:34:21 +02:00
Thomas Müller
b48dffa9a3 Merge pull request #5072 from owncloud/apache-auth-master
OC6 Apache Authentication
2013-10-07 06:29:56 -07:00
Thomas Müller
730c80ff9c adding additional exceptions for special cases where creating a file might not be allowed 2013-10-07 15:11:47 +02:00
Thomas Müller
1e47468c53 Merge pull request #4974 from owncloud/fixing-4011-master
error handling added in case file_put_contents is failing
2013-10-07 02:58:00 -07:00
Thomas Müller
414b2eb4b6 upload abortion detection only for PUT
e.g. LOCK would break with this approach
2013-10-04 20:20:33 +02:00
Thomas Müller
aebc330f26 Merge branch 'master' into fixing-4011-master 2013-10-04 14:06:42 +02:00
Markus Goetz
7f7718888d DAV: Use fileinfo_cache for ETag 2013-10-03 17:09:08 +02:00
Thomas Müller
4cecede13d code cleanup - remove special case for webdav in handleApacheAuth() 2013-10-02 00:55:35 +02:00
Thomas Müller
7e9e23f210 Merge branch 'master' into apache-auth-master 2013-10-02 00:21:11 +02:00
Thomas Müller
8e0060405d reorganize file in lib 2013-09-30 16:39:03 +02:00
Thomas Müller
9c9dc276b7 move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
	lib/private/vcategories.php
2013-09-30 16:36:59 +02:00