Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change exit calls to throwing an exception | Bart Visscher | 2013-07-21 | 1 | -2/+1 |
| | | | | This way the error won't be fatal in a unit test | ||||
* | Fix renaming using parenthesis | Bart Visscher | 2013-07-05 | 1 | -5/+21 |
| | |||||
* | Make buildNotExistingFileName testable and write unittests | Bart Visscher | 2013-07-05 | 1 | -1/+13 |
| | |||||
* | Fix: The check if upload_max_filesize or post_max_size is 0 fails if only ↵ | Roland Hager | 2013-06-21 | 1 | -2/+2 |
| | | | | | | one of them is 0. $upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0" | ||||
* | actually return result | Robin Appelman | 2013-06-07 | 1 | -2/+2 |
| | |||||
* | fix variable name | Robin Appelman | 2013-06-07 | 1 | -2/+2 |
| | |||||
* | seperate mimetype guessing from filename | Robin Appelman | 2013-06-06 | 1 | -12/+22 |
| | |||||
* | Style fixes | Michael Gapczynski | 2013-05-29 | 1 | -21/+21 |
| | |||||
* | Cache mimetype icons | Robin Appelman | 2013-05-29 | 1 | -7/+15 |
| | |||||
* | Merge pull request #2491 from riso/xsendfile_fix_zip | Bart Visscher | 2013-05-03 | 1 | -10/+14 |
|\ | | | | | improved handling of xsendfile zip generation race condition | ||||
| * | fixed xsendfile zip generation race condition | Valerio Ponte | 2013-03-20 | 1 | -10/+14 |
| | | |||||
* | | check if there is a default/ folder in the theme directory if no theme exists | Bernhard Posselt | 2013-04-24 | 1 | -1/+1 |
|/ | |||||
* | Don't show storage space warning when the free space can't be determined | Robin Appelman | 2013-03-15 | 1 | -2/+10 |
| | |||||
* | Don't block uploads if the max upload size is unknown | Robin Appelman | 2013-03-15 | 1 | -2/+2 |
| | |||||
* | Improve handeling of unlimited max upload size | Robin Appelman | 2013-03-15 | 1 | -1/+7 |
| | |||||
* | put value assignment into brackets | Björn Schießle | 2013-02-22 | 1 | -1/+1 |
| | |||||
* | return both, count and result if the operation succeeded or failed. Maybe in ↵ | Björn Schießle | 2013-02-22 | 1 | -3/+6 |
| | | | | some cases it is useful to know how much bytes where copied | ||||
* | using the number of writen bytes as indicator if streamCopy() was ↵ | Björn Schießle | 2013-02-22 | 1 | -3/+5 |
| | | | | successfully. Instead check if fwrite returns the number of bytes or false | ||||
* | Give storage backends the option to define having no known free space | Robin Appelman | 2013-02-16 | 1 | -2/+6 |
| | | | | When this is the case only the configured max upload size is taking into account for uploading | ||||
* | Style-fix: Breakup long lines | Bart Visscher | 2013-02-14 | 1 | -4/+8 |
| | |||||
* | Coding style | Lukas Reschke | 2013-02-10 | 1 | -1/+2 |
| | |||||
* | Use sanitizeHTML instead of stripslashes + htmlspecialchars | Lukas Reschke | 2013-02-10 | 1 | -1/+1 |
| | |||||
* | simplyfy mimetype parsing of 'file' output | Jörn Friedrich Dreyer | 2013-02-07 | 1 | -4/+3 |
| | |||||
* | merge master into filesystem | Robin Appelman | 2013-01-30 | 1 | -5/+2 |
|\ | |||||
| * | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-01-26 | 1 | -0/+19 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'refs/remotes/upstream/master' | TheSFReader | 2013-01-25 | 1 | -3/+21 |
| |\ \ | |||||
| * | | | Simplify the code and remove a first unnecessary (and non conform) '&' ↵ | TheSFReader | 2013-01-25 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | character when there are pending arguments | ||||
* | | | | Fix OC_Helper and change deprecated methods | Michael Gapczynski | 2013-01-26 | 1 | -3/+3 |
| | | | | |||||
* | | | | merge master into filesystem | Robin Appelman | 2013-01-26 | 1 | -0/+19 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge pull request #1059 from owncloud/fixing-998-master | Thomas Müller | 2013-01-26 | 1 | -0/+19 |
| |\ \ \ | | |_|/ | |/| | | Fixing 998 master | ||||
| | * | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 1 | -27/+28 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js | ||||
| | * \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 1 | -18/+43 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/helper.php | ||||
| | * | | | | moving storage calculation code to OC_Helper::getStorageInfo() | Thomas Mueller | 2013-01-02 | 1 | -0/+19 |
| | | | | | | |||||
* | | | | | | merge master into filesytem | Robin Appelman | 2013-01-20 | 1 | -3/+21 |
|\| | | | | | |||||
| * | | | | | Also replace the backslash with a minus | Lukas Reschke | 2013-01-19 | 1 | -1/+2 |
| | |_|/ / | |/| | | | | | | | | | | | | | For Windows systems | ||||
| * | | | | Merge pull request #986 from owncloud/fixing-784-master | Thomas Müller | 2013-01-18 | 1 | -2/+19 |
| |\ \ \ \ | | |_|_|/ | |/| | | | the maximum upload size is now part of the response of the upload and de... | ||||
| | * | | | fixing indent | Thomas Mueller | 2013-01-18 | 1 | -16/+16 |
| | | | | | |||||
| | * | | | Merge branch 'master' into fixing-784-master | Thomas Mueller | 2013-01-06 | 1 | -18/+43 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upload.php apps/files/js/files.js lib/helper.php | ||||
| | * | | | the maximum upload size is now part of the response of the upload and delete ↵ | Thomas Müller | 2012-12-20 | 1 | -0/+17 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | operation. the maximum upload size is updated within the browser once an upload or delete operation has been finished | ||||
* | | | | merge master into filesystem | Robin Appelman | 2013-01-16 | 1 | -1/+5 |
|\| | | | |||||
| * | | | Whitespace cleanup | Bart Visscher | 2013-01-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | handling proper display of files/folders with negative size | Thomas Mueller | 2013-01-14 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | refs #1162 | ||||
* | | | | merge master into filesystem | Robin Appelman | 2013-01-15 | 1 | -24/+4 |
|\| | | | |||||
| * | | | Check for string position instead of string existence | Lukas Reschke | 2013-01-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | otherwise /foo/bar would be detected as a subfolder of /bar THX @icewind1991 | ||||
| * | | | Commentblocks should begin with two * | Lukas Reschke | 2013-01-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add @brief to description | Lukas Reschke | 2013-01-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Simplify the isSubDirectory() function | Lukas Reschke | 2013-01-13 | 1 | -22/+2 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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! | ||||
* | | | merge master into filesystem | Robin Appelman | 2013-01-07 | 1 | -19/+44 |
|\| | | |||||
| * | | OC_Helper::is_function_enabled() added to find out if a function is available | Thomas Mueller | 2013-01-04 | 1 | -18/+43 |
| |/ | | | | | | | And some documentation adjusted on the way | ||||
* | | merge master into filesystem | Robin Appelman | 2012-12-15 | 1 | -1/+1 |
|\| |