1ef3e4c5c6
simplyfy mimetype parsing of 'file' output
2013-02-07 17:46:16 +01:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
9c7a18044d
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-26 23:19:40 +01:00
7237ebf08b
Fix OC_Helper and change deprecated methods
2013-01-26 15:16:53 -05:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
2aead5727e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-25 17:15:02 +01:00
9f5847b739
Simplify the code and remove a first unnecessary (and non conform) '&' character when there are pending arguments
2013-01-25 17:02:44 +01:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
42b924da0e
Also replace the backslash with a minus
...
For Windows systems
2013-01-19 19:47:26 +01:00
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
44e5c052b3
handling proper display of files/folders with negative size
...
refs #1162
2013-01-14 23:39:31 +01:00
99adfbdb86
Check for string position instead of string existence
...
otherwise /foo/bar would be detected as a subfolder of /bar
THX @icewind1991
2013-01-14 16:51:35 +01:00
b7db967dc5
Commentblocks should begin with two *
2013-01-13 14:54:18 +01:00
c27833b143
Add @brief to description
2013-01-13 14:50:31 +01:00
e151210a62
Simplify the isSubDirectory() function
...
isSubDirectory() checks if a specified $sub is a subdirectory of the
$parent, this is needed to prevent file inclusions.
Actually, the current code is more kind of a "hack" which I always
struggle over if browsing through source. So this should be a much
better implementation.
The implementation is really straightforward:
- [realpath()](http://php.net/manual/function.realpath.php ) expands all
symbolic links and resolves references to '/./', '/../' and extra '/'
characters in the input path and return the canonicalized absolute
pathname.
- [strpos()](php.net/manual/function.strpos.php) returns FALSE if the
substring wasn't found.
Since this is an absolutely critical piece of code, I'd like to ensure
that this is absolutely safe!
2013-01-13 14:33:19 +01:00
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +01:00
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
dfc8d757b5
OC_Helper::is_function_enabled() added to find out if a function is available
...
And some documentation adjusted on the way
2013-01-04 23:00:51 +01:00
2d36a20a1d
moving storage calculation code to OC_Helper::getStorageInfo()
2013-01-02 14:35:45 +01:00
39d874cd90
the maximum upload size is now part of the response of the upload and delete operation.
...
the maximum upload size is updated within the browser once an upload or delete operation has been finished
2012-12-20 17:16:53 +01:00
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
8256650da8
Fix "No space found after comma in function call"
2012-12-15 00:43:46 +01:00
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01:00
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
5b2aeebaf0
Merge pull request #280 from butonic/feature_bmp_support
...
add bmp support
2012-11-19 00:53:46 -08:00
a922eb756e
merge master into filesystem
2012-11-18 14:07:52 +01:00
de7e419610
Fixed style according to owncloud styleguide
2012-11-14 20:10:20 +01:00
8e190a5a97
Moved X-Sendfile headers into OC_Files::get
...
now should work with temp files too
2012-11-14 20:10:20 +01:00
0ce5e9257e
add php-doc for ellipsis
2012-11-12 14:04:23 +01:00
28671d92c0
move code to better places
2012-11-12 13:56:29 +01:00
091ff02362
merge master into filesystem
2012-11-08 17:32:00 +01:00
0833be9d4e
Migration: On import of user accounts only import folders in home dir, use OC_Helper::copyr
...
Check files when copying recursivley
Remove obsolete method
Dont count '.' and '..' as directories when importing.
2012-11-08 11:37:27 +00:00
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
f8d1d7787e
Checkstyle fixes for SpaceBeforeOpenBrace
2012-11-04 10:46:32 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
dfc8228fb4
NoSpaceAfterComma
2012-10-28 23:58:08 +01:00
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
4b616764e8
Merge branch 'master' into filesystem
2012-10-26 22:32:44 +02:00
d428d72dab
Fix mimetype detection with the 'file' utility
2012-10-26 21:02:04 +03:00
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
Jörn Friedrich Dreyer
Robin Appelman
TheSFReader
Michael Gapczynski
Thomas Müller
Lukas Reschke
Bart Visscher
Frank Karlitschek
Valerio Ponte
Tom Needham
Felix Moeller
Victor Dubiniuk