Commit Graph

63 Commits

Author SHA1 Message Date
Thomas Müller 9d869ab596 we shall explode on ',' only 2014-01-07 14:53:02 +01:00
Pellaeon Lin fc607e6bce Separate PHP upload limit and free space 2013-12-08 22:59:46 +08:00
Simon Könnecke 243f3f0c4c No decimal points for Kilobyte and Byte #5371. 2013-11-25 12:26:03 +01:00
Vincent Petry 614e4d485c External storage space is now not counted in total space
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.

Fixes #5924
2013-11-18 18:09:01 +01:00
blizzz 7c89309e26 Merge pull request #5691 from owncloud/switch-to-oc6-documentation
move to oc6 documentation
2013-11-05 08:22:26 -08:00
Thomas Müller 01f2b7eb3a move to oc6 documentation 2013-11-04 22:50:12 +01:00
Vincent Petry e62ca4ea4f Append file etag to preview URLs
Fixes #5534
2013-10-28 14:14:55 +01:00
Thomas Müller 124984905e introduce OC_Helper::linkToDocs() 2013-10-21 22:01:27 +02:00
Thomas Müller fdeef5e874 Merge branch 'master' into fixing-appframework-master
Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
Thomas Müller 6df5c7ebd5 streamCopy() should return proper structure.
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
Thomas Müller 780280e53f fixing errors regarding wrong function calls / missing parameters 2013-10-07 00:35:05 +02:00
Bart Visscher 61a9098b7d Add Helper and URLGenerator interfaces to server container 2013-10-04 18:11:02 +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