summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #13425 from owncloud/phpdoc_cleanupMorris Jobke2015-02-1013-39/+39
|\
| * Cleanup of PHPDoc return typesRobin McCorkell2015-01-1613-39/+39
* | Merge pull request #13842 from owncloud/is_file_2_is_readableMorris Jobke2015-02-092-2/+2
|\ \
| * | readd is_fileJörn Friedrich Dreyer2015-02-032-2/+2
| * | :camel:caseArthur Schiwon2015-02-021-1/+1
| * | check if cache files are readableJörn Friedrich Dreyer2015-02-022-2/+2
* | | Merge pull request #13511 from owncloud/naturalsort_speeeeeedLukas Reschke2015-02-092-11/+13
|\ \ \
| * | | Store FileInfo::getType() result for future useRobin McCorkell2015-02-091-4/+3
| * | | Performance improvements for NaturalSortRobin McCorkell2015-02-091-7/+10
* | | | Merge pull request #13928 from owncloud/prevent_ghost_files_masterVincent Petry2015-02-091-2/+9
|\ \ \ \
| * | | | for password protected link shares the password is stored in shareWith, so we...Bjoern Schiessle2015-02-051-2/+9
* | | | | Merge pull request #13921 from owncloud/ocs-afVincent Petry2015-02-094-6/+208
|\ \ \ \ \
| * | | | | fix license emailBernhard Posselt2015-02-052-6/+6
| * | | | | add a controller and reponse for ocsBernhard Posselt2015-02-053-1/+203
| |/ / / /
* | | | | Merge pull request #13852 from owncloud/cache-app-versionsVincent Petry2015-02-091-2/+7
|\ \ \ \ \
| * | | | | clear app version cache on upgradeRobin Appelman2015-02-031-0/+1
| * | | | | Cache app versionsRobin Appelman2015-02-031-2/+6
* | | | | | Merge pull request #13870 from owncloud/drop-oc-preferences-2Vincent Petry2015-02-091-181/+0
|\ \ \ \ \ \
| * | | | | | drop OC\PreferencesMorris Jobke2015-02-041-181/+0
* | | | | | | Merge pull request #13869 from owncloud/drop-oc-preferencesVincent Petry2015-02-092-122/+0
|\ \ \ \ \ \ \
| * | | | | | | drop OC_PreferencesMorris Jobke2015-02-042-122/+0
| |/ / / / / /
* | | | | | | Merge pull request #13973 from owncloud/enhancement/security/13366Lukas Reschke2015-02-096-29/+53
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId`Lukas Reschke2015-02-096-29/+53
* | | | | | | Merge pull request #13854 from owncloud/avatar-existsVincent Petry2015-02-093-6/+17
|\ \ \ \ \ \ \
| * | | | | | | Add a better way to check if an avatar exists for the userRobin Appelman2015-02-033-6/+17
* | | | | | | | Check directory handle before we use itRobin Appelman2015-02-091-6/+8
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-092-0/+2
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #13948 from owncloud/cache-move-transactionLukas Reschke2015-02-081-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Use transactions when renaming directory contentsRobin Appelman2015-02-061-0/+2
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-084-2/+6
* | | | | | | | Merge pull request #12283 from oparoz/sfnt-fontsMorris Jobke2015-02-073-84/+113
|\ \ \ \ \ \ \ \
| * | | | | | | | Updated the media type of some font typesOlivier Paroz2015-01-243-84/+113
* | | | | | | | | Merge pull request #13830 from owncloud/fix-redirect-404Morris Jobke2015-02-071-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't encode url unecessary twiceLukas Reschke2015-02-021-2/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-072-4/+32
* | | | | | | | | Normalize before processingLukas Reschke2015-02-062-8/+20
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #13932 from owncloud/revert-sabredav-etag-masterThomas Müller2015-02-063-20/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "adding OC-ETag header"Vincent Petry2015-02-053-20/+15
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-066-20/+50
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #13881 from owncloud/upload_to_root_of_mountpointBjörn Schießle2015-02-041-0/+5
|\ \ \ \ \ \ \
| * | | | | | | detect root of mountpoint also if the trailing slash is missedBjoern Schiessle2015-02-041-0/+5
| |/ / / / / /
* | | | / / / [tx-robot] updated from transifexJenkins for ownCloud2015-02-042-4/+32
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #13843 from owncloud/fix-files-disabledThomas Müller2015-02-034-0/+59
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | enabled disabled files app in repair stepMorris Jobke2015-02-034-2/+54
| * | | | | Disallow disabling of files appMorris Jobke2015-02-032-0/+7
* | | | | | Merge pull request #13791 from owncloud/extstorage-fixdavexceptionsThomas Müller2015-02-031-0/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix DAV exceptions, some will still return false nowVincent Petry2015-01-301-0/+22
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-034-28/+56
| |_|/ / / |/| | | |
* | | | | Merge pull request #13822 from owncloud/include-core-version-in-js-version-tagThomas Müller2015-02-021-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | include core version into js/css version tag - fixes #13702Thomas Müller2015-02-021-2/+4