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
|
b48dffa9a3
|
Merge pull request #5072 from owncloud/apache-auth-master
OC6 Apache Authentication
|
2013-10-07 06:29:56 -07: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 |