Commit message (Expand) | 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) '&' chara... | TheSFReader | 2013-01-25 | 1 | -5/+2 |
* | | | | 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 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-18 | 1 | -27/+28 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into fixing-998-master | Thomas Mueller | 2013-01-06 | 1 | -18/+43 |
| | |\ \ \ | |||||
| | * | | | | 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 |
| | |_|/ / | |/| | | | |||||
| * | | | | Merge pull request #986 from owncloud/fixing-784-master | Thomas Müller | 2013-01-18 | 1 | -2/+19 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | 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 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | * | | | the maximum upload size is now part of the response of the upload and delete ... | Thomas Müller | 2012-12-20 | 1 | -0/+17 |
| | | |/ | | |/| | |||||
* | | | | 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 |
* | | | | 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 |
| * | | | 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 |
| | |/ | |/| | |||||
* | | | 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 |
| |/ | |||||
* | | 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 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 |
| |/ | |||||
* | | 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 OC... | Tom Needham | 2012-11-08 | 1 | -1/+1 |
* | | 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 |
| |\ | |||||
| | * | Merge branch 'master' into routing | Bart Visscher | 2012-10-17 | 1 | -3/+17 |
| | |\ |