| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |\| | |||||
| | * | Fix "No space found after comma in function call" | Bart Visscher | 2012-12-15 | 1 | -1/+1 |
| | | | |||||
| * | | merge master into filesystem | Robin Appelman | 2012-11-30 | 1 | -1/+0 |
| |\| | |||||
| | * | implement share via link token | Jörn Friedrich Dreyer | 2012-11-20 | 1 | -1/+0 |
| | | | |||||
| * | | merge master into filesystem | Robin Appelman | 2012-11-21 | 1 | -0/+16 |
| |\| | |||||
| | * | Merge pull request #280 from butonic/feature_bmp_support | Frank Karlitschek | 2012-11-19 | 1 | -0/+16 |
| | |\ | | | | | | | add bmp support | ||||
| | | * | add php-doc for ellipsis | Jörn Friedrich Dreyer | 2012-11-12 | 1 | -2/+8 |
| | | | | |||||
| | | * | move code to better places | Jörn Friedrich Dreyer | 2012-11-12 | 1 | -0/+10 |
| | | | | |||||
| * | | | merge master into filesystem | Robin Appelman | 2012-11-18 | 1 | -0/+31 |
| |\| | | |||||
| | * | | Fixed style according to owncloud styleguide | Valerio Ponte | 2012-11-14 | 1 | -1/+2 |
| | | | | |||||
| | * | | Moved X-Sendfile headers into OC_Files::get | Valerio Ponte | 2012-11-14 | 1 | -0/+30 |
| | |/ | | | | | | | now should work with temp files too | ||||
| * | | merge master into filesystem | Robin Appelman | 2012-11-08 | 1 | -1/+1 |
| |\| | |||||
| | * | Migration: On import of user accounts only import folders in home dir, use ↵ | Tom Needham | 2012-11-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | OC_Helper::copyr Check files when copying recursivley Remove obsolete method Dont count '.' and '..' as directories when importing. | ||||
| * | | merge master into filesystem | Robin Appelman | 2012-11-04 | 1 | -6/+6 |
| |\| | |||||
| | * | Checkstyle fixes for SpaceBeforeOpenBrace | Felix Moeller | 2012-11-04 | 1 | -4/+4 |
| | | | |||||
| | * | Checkstyle: many fixes | Felix Moeller | 2012-11-02 | 1 | -2/+2 |
| | | | |||||
| * | | merge master into filesystem | Robin Appelman | 2012-10-30 | 1 | -10/+10 |
| |\| | |||||
| | * | NoSpaceAfterComma | Felix Moeller | 2012-10-28 | 1 | -10/+10 |
| | | | |||||
| * | | Merge branch 'master' into filesystem | Robin Appelman | 2012-10-27 | 1 | -2/+16 |
| |\| | |||||
| | * | Merge branch 'routing' | Bart Visscher | 2012-10-27 | 1 | -2/+16 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php | ||||
| | | * | Merge branch 'master' into routing | Bart Visscher | 2012-10-17 | 1 | -3/+17 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |