summaryrefslogtreecommitdiffstats
path: root/lib/helper.php
Commit message (Expand)AuthorAgeFilesLines
* Coding styleLukas Reschke2013-02-101-1/+2
* Use sanitizeHTML instead of stripslashes + htmlspecialcharsLukas Reschke2013-02-101-1/+1
* simplyfy mimetype parsing of 'file' outputJörn Friedrich Dreyer2013-02-071-4/+3
* merge master into filesystemRobin Appelman2013-01-301-5/+2
|\
| * Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-01-261-0/+19
| |\
| * \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-01-251-3/+21
| |\ \
| * | | Simplify the code and remove a first unnecessary (and non conform) '&' chara...TheSFReader2013-01-251-5/+2
* | | | Fix OC_Helper and change deprecated methodsMichael Gapczynski2013-01-261-3/+3
* | | | merge master into filesystemRobin Appelman2013-01-261-0/+19
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-261-0/+19
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-181-27/+28
| | |\ \
| | * \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-061-18/+43
| | |\ \ \
| | * | | | moving storage calculation code to OC_Helper::getStorageInfo()Thomas Mueller2013-01-021-0/+19
* | | | | | merge master into filesytemRobin Appelman2013-01-201-3/+21
|\| | | | |
| * | | | | Also replace the backslash with a minusLukas Reschke2013-01-191-1/+2
| | |_|/ / | |/| | |
| * | | | Merge pull request #986 from owncloud/fixing-784-masterThomas Müller2013-01-181-2/+19
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | fixing indentThomas Mueller2013-01-181-16/+16
| | * | | Merge branch 'master' into fixing-784-masterThomas Mueller2013-01-061-18/+43
| | |\ \ \ | | | | |/ | | | |/|
| | * | | the maximum upload size is now part of the response of the upload and delete ...Thomas Müller2012-12-201-0/+17
| | | |/ | | |/|
* | | | merge master into filesystemRobin Appelman2013-01-161-1/+5
|\| | |
| * | | Whitespace cleanupBart Visscher2013-01-161-1/+1
| * | | handling proper display of files/folders with negative sizeThomas Mueller2013-01-141-0/+4
* | | | merge master into filesystemRobin Appelman2013-01-151-24/+4
|\| | |
| * | | Check for string position instead of string existenceLukas Reschke2013-01-141-1/+1
| * | | Commentblocks should begin with two *Lukas Reschke2013-01-131-1/+1
| * | | Add @brief to descriptionLukas Reschke2013-01-131-1/+1
| * | | Simplify the isSubDirectory() functionLukas Reschke2013-01-131-22/+2
| | |/ | |/|
* | | merge master into filesystemRobin Appelman2013-01-071-19/+44
|\| |
| * | OC_Helper::is_function_enabled() added to find out if a function is availableThomas Mueller2013-01-041-18/+43
| |/
* | merge master into filesystemRobin Appelman2012-12-151-1/+1
|\|
| * Fix "No space found after comma in function call"Bart Visscher2012-12-151-1/+1
* | merge master into filesystemRobin Appelman2012-11-301-1/+0
|\|
| * implement share via link tokenJörn Friedrich Dreyer2012-11-201-1/+0
* | merge master into filesystemRobin Appelman2012-11-211-0/+16
|\|
| * Merge pull request #280 from butonic/feature_bmp_supportFrank Karlitschek2012-11-191-0/+16
| |\
| | * add php-doc for ellipsisJörn Friedrich Dreyer2012-11-121-2/+8
| | * move code to better placesJörn Friedrich Dreyer2012-11-121-0/+10
* | | merge master into filesystemRobin Appelman2012-11-181-0/+31
|\| |
| * | Fixed style according to owncloud styleguideValerio Ponte2012-11-141-1/+2
| * | Moved X-Sendfile headers into OC_Files::getValerio Ponte2012-11-141-0/+30
| |/
* | merge master into filesystemRobin Appelman2012-11-081-1/+1
|\|
| * Migration: On import of user accounts only import folders in home dir, use OC...Tom Needham2012-11-081-1/+1
* | merge master into filesystemRobin Appelman2012-11-041-6/+6
|\|
| * Checkstyle fixes for SpaceBeforeOpenBraceFelix Moeller2012-11-041-4/+4
| * Checkstyle: many fixesFelix Moeller2012-11-021-2/+2
* | merge master into filesystemRobin Appelman2012-10-301-10/+10
|\|
| * NoSpaceAfterCommaFelix Moeller2012-10-281-10/+10
* | Merge branch 'master' into filesystemRobin Appelman2012-10-271-2/+16
|\|
| * Merge branch 'routing'Bart Visscher2012-10-271-2/+16
| |\
| | * Merge branch 'master' into routingBart Visscher2012-10-171-3/+17
| | |\