Pellaeon Lin
|
099b71c712
|
Merge branch 'master' into pr-exceed_upload_limit_msg
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
|
2014-01-30 22:50:20 +08:00 |
Robin Appelman
|
3c1ab66eda
|
Reuse the calculated free_space in buildFileStorageStatistics
|
2014-01-27 15:56:57 +01:00 |
Andreas Fischer
|
96f194c0f6
|
Add icons for mdb and accdb files.
|
2014-01-23 03:06:14 +01:00 |
|
Andreas Fischer
|
47ea7704ca
|
Fix icons for xml,ppt,dot,dotx files.
|
2014-01-23 02:46:05 +01:00 |
Thomas Müller
|
09d7882571
|
trimming all array elements
|
2014-01-07 19:47:01 +01:00 |
|
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 |