Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove all occurences of @brief and @returns from PHPDoc | Morris Jobke | 2014-05-19 | 1 | -23/+23 |
| | | | | * test case added to avoid adding them later | ||||
* | Fix all PHPDoc types and variable names, in /lib | Robin McCorkell | 2014-05-13 | 1 | -7/+7 |
| | |||||
* | Replace @returns with @return, in /lib | Robin McCorkell | 2014-05-13 | 1 | -1/+1 |
| | |||||
* | Rename issubdirectory to isSubDirectory | Lukas Reschke | 2014-05-11 | 1 | -1/+1 |
| | |||||
* | Harden issubdirectory() | Lukas Reschke | 2014-05-11 | 1 | -1/+13 |
| | | | | realpath() may return false in case the directory does not exist since we can not be sure how different PHP versions may behave here we do an additional check whether realpath returned false | ||||
* | Merge pull request #8223 from owncloud/fix_linkToPublic | Vincent Petry | 2014-05-07 | 1 | -5/+13 |
|\ | | | | | Fix linkToPublic and linkToAbsolute. | ||||
| * | Also fix linkToAbsolute | Thomas Tanghus | 2014-04-16 | 1 | -3/+7 |
| | | |||||
| * | Fix linkToPublic. Refs #8218 | Thomas Tanghus | 2014-04-15 | 1 | -2/+6 |
| | | |||||
* | | Merge pull request #8023 from flyser/master | Morris Jobke | 2014-05-03 | 1 | -0/+26 |
|\ \ | | | | | | | Fix setting the max-upload-size for really large values. | ||||
| * | | Fix setting the max-upload-size for really large values. | Fabian Henze | 2014-04-03 | 1 | -0/+26 |
| | | | | | | | | | | | | php can only parse filesize units up to gigabytes, not terabytes or petabytes. | ||||
* | | | Some more PHPDoc fixes | Lukas Reschke | 2014-04-21 | 1 | -1/+1 |
| | | | |||||
* | | | White-list known secure mime types. Refs. #8184 | Thomas Tanghus | 2014-04-14 | 1 | -0/+10 |
| |/ |/| | |||||
* | | Allow reusing FileInfo for getStorageInfo | Robin Appelman | 2014-04-02 | 1 | -3/+6 |
|/ | |||||
* | Sub-dir was prepended twice | Thomas Tanghus | 2014-03-29 | 1 | -2/+1 |
| | |||||
* | Merge pull request #7764 from owncloud/datadir-chmod | icewind1991 | 2014-03-17 | 1 | -29/+0 |
|\ | | | | | use a non-recursive chmod on the datadir | ||||
| * | use a non-recursive chmod on the datadir | Robin Appelman | 2014-03-17 | 1 | -29/+0 |
| | | |||||
* | | Correctly round bytes when converted from human readable format | Vincent Petry | 2014-03-17 | 1 | -2/+2 |
|/ | | | | | Instead of leave two decimal places which is confusing, round the byte values correctly to the closest byte. | ||||
* | Fixed total space display when data size exceeds quota | Vincent Petry | 2014-03-10 | 1 | -1/+10 |
| | | | | | The total space display in the personal page now shows the quota value instead of used space when used space exceeds the quota (soft quota). | ||||
* | Fixed upload issue when free space is not known | Vincent Petry | 2014-03-06 | 1 | -1/+1 |
| | |||||
* | introduce new theme function to allow full creation of documentation links: ↵ | Thomas Müller | 2014-02-25 | 1 | -1/+1 |
| | | | | buildDocLinkToKey() | ||||
* | fix filetype icons for gzip, tex, perl, csv, sh | Jan-Christoph Borchardt | 2014-02-20 | 1 | -0/+5 |
| | |||||
* | fix lots of file type icons for archives, js, flash, ics, fonts, code, ... | Jan-Christoph Borchardt | 2014-02-19 | 1 | -1/+25 |
| | |||||
* | use file icon as fallback instead of application icon, fix #7237 | Jan-Christoph Borchardt | 2014-02-17 | 1 | -0/+1 |
| | |||||
* | merge master into storagestatistics-reuse | Robin Appelman | 2014-02-05 | 1 | -38/+35 |
|\ | |||||
| * | Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg | Jan-Christoph Borchardt | 2014-02-04 | 1 | -12/+28 |
| |\ | | | | | | | Change misleading message when file size exceeds upload limit | ||||
| | * | Merge branch 'master' into pr-exceed_upload_limit_msg | Pellaeon Lin | 2014-01-30 | 1 | -3/+8 |
| | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php | ||||
| | * | | Separate PHP upload limit and free space | Pellaeon Lin | 2013-12-08 | 1 | -12/+28 |
| | | | | |||||
| * | | | Remove unused functions from OC_Helper | Bart Visscher | 2014-01-31 | 1 | -23/+0 |
| | |/ | |/| | | | | | | | init_var and init_radio where only used in the installation template | ||||
| * | | Add icons for mdb and accdb files. | Andreas Fischer | 2014-01-23 | 1 | -0/+1 |
| | | | |||||
| * | | Fix icons for xml,ppt,dot,dotx files. | Andreas Fischer | 2014-01-23 | 1 | -0/+2 |
| | | | |||||
* | | | Reuse the calculated free_space in buildFileStorageStatistics | Robin Appelman | 2014-01-27 | 1 | -3/+6 |
|/ / | |||||
* | | trimming all array elements | Thomas Müller | 2014-01-07 | 1 | -1/+3 |
| | | |||||
* | | we shall explode on ',' only | Thomas Müller | 2014-01-07 | 1 | -1/+1 |
| | | |||||
* | | No decimal points for Kilobyte and Byte #5371. | Simon Könnecke | 2013-11-25 | 1 | -1/+1 |
|/ | |||||
* | External storage space is now not counted in total space | Vincent Petry | 2013-11-18 | 1 | -1/+2 |
| | | | | | | | Added argument to getFileInfo() to disable adding the size of mountpoints to a directory's size. Fixes #5924 | ||||
* | Merge pull request #5691 from owncloud/switch-to-oc6-documentation | blizzz | 2013-11-05 | 1 | -1/+1 |
|\ | | | | | move to oc6 documentation | ||||
| * | move to oc6 documentation | Thomas Müller | 2013-11-04 | 1 | -1/+1 |
| | | |||||
* | | Append file etag to preview URLs | Vincent Petry | 2013-10-28 | 1 | -2/+2 |
|/ | | | | Fixes #5534 | ||||
* | introduce OC_Helper::linkToDocs() | Thomas Müller | 2013-10-21 | 1 | -0/+9 |
| | |||||
* | Merge branch 'master' into fixing-appframework-master | Thomas Müller | 2013-10-16 | 1 | -2/+2 |
|\ | | | | | | | | | | | Conflicts: lib/private/appframework/middleware/security/securitymiddleware.php tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php | ||||
| * | streamCopy() should return proper structure. | Thomas Müller | 2013-10-14 | 1 | -2/+2 |
| | | | | | | | | Callers of streamCopy() expect an array to be returned containing count and result. | ||||
* | | fixing errors regarding wrong function calls / missing parameters | Thomas Müller | 2013-10-07 | 1 | -1/+1 |
|/ | |||||
* | Add Helper and URLGenerator interfaces to server container | Bart Visscher | 2013-10-04 | 1 | -48/+4 |
| | |||||
* | move the private namespace OC into lib/private - OCP will stay in lib/public | Thomas Müller | 2013-09-30 | 1 | -0/+934 |
Conflicts: lib/private/vcategories.php |