Robin Appelman
|
1378af838c
|
merge master into hooks-view-same-start
|
2013-10-10 11:34:30 +02:00 |
VicDeo
|
1cb47bf777
|
Merge pull request #5221 from owncloud/fixing-5217-master
fixing php 5.3 compatibility
|
2013-10-10 01:55:18 -07:00 |
|
Robin Appelman
|
7f8eeb0474
|
ensure the view's root is a subfolder of the the default root, not only starting the same
|
2013-10-09 20:46:43 +02:00 |
|
Robin Appelman
|
38c563dcdc
|
don't trigger the create hooks when if the file already exists for file_put_contents
|
2013-10-09 20:34:18 +02:00 |
Thomas Müller
|
51b581a84d
|
php 5.3 compatibility for \OC\Files\Storage
|
2013-10-08 23:00:41 +02:00 |
Victor Dubiniuk
|
8da1aac1d0
|
Check result only once
|
2013-10-04 23:24:38 +03:00 |
|
Victor Dubiniuk
|
ef65037211
|
Make mimetypes static. Jenkis will be happy
|
2013-10-04 18:09:42 +03:00 |
|
Victor Dubiniuk
|
65750cb244
|
Load all mimetypes in one go
|
2013-10-04 16:17:19 +03:00 |
|
Thomas Müller
|
78c60c25c8
|
only perform files upgrade in case there are actually entries in the old fscache table
|
2013-10-02 13:00:05 +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 |