summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22493 from owncloud/issue_22467Thomas Müller2016-02-184-13/+9
|\
| * Make scrutinizer happyRoeland Jago Douma2016-02-182-3/+2
| * getRootFolder should not setup the FS for any userRoeland Jago Douma2016-02-183-10/+7
* | Merge pull request #22482 from owncloud/getowner-cacheThomas Müller2016-02-181-1/+6
|\ \
| * | No more staticJoas Schilling2016-02-181-5/+4
| * | cache result for getownerRobin Appelman2016-02-171-1/+7
* | | Merge pull request #21610 from owncloud/quota-sharedfileThomas Müller2016-02-181-5/+22
|\ \ \
| * | | Don't apply quota in stream wrapper for part filesVincent Petry2016-02-171-5/+22
* | | | set correct http status codev1r0x2016-02-181-1/+1
| |_|/ |/| |
* | | Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracleThomas Müller2016-02-181-0/+11
|\ \ \ | |_|/ |/| |
| * | Make sure our index names fit in oracleJoas Schilling2016-02-161-0/+11
* | | Merge pull request #16783 from owncloud/handle-redirects-globalThomas Müller2016-02-172-2/+10
|\ \ \ | |_|/ |/| |
| * | Send 401 header for OC_JSON::checkLoggedIn()Lukas Reschke2016-02-161-0/+1
| * | Catch auth coming from JS in OCSLukas Reschke2016-02-151-2/+9
| |/
* | Merge pull request #22451 from owncloud/use-proper-user-folderThomas Müller2016-02-171-1/+1
|\ \
| * | Handles null as return code and uses proper UserFolder in trashbinMorris Jobke2016-02-161-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-172-0/+8
|/ /
* | Merge pull request #22416 from owncloud/fix_22402Thomas Müller2016-02-161-11/+5
|\ \
| * | Return proper error string if sharing for this user is disabledRoeland Jago Douma2016-02-161-11/+5
* | | Merge pull request #22338 from owncloud/fix_22247Thomas Müller2016-02-161-2/+3
|\ \ \ | |/ / |/| |
| * | More characters are allowed on POSIX systemsRoeland Jago Douma2016-02-121-2/+3
* | | Merge pull request #22407 from fancycode/untrusted_domainThomas Müller2016-02-161-1/+1
|\ \ \
| * | | Pass checked host as "domain" variable to "untrustedDomain" template.Joachim Bauch2016-02-151-1/+1
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-162-0/+2
* | | Merge pull request #22376 from owncloud/fix-return-code-getAppPathThomas Müller2016-02-151-14/+29
|\ \ \ | |/ / |/| |
| * | Properly handle return code of OC_App::getAppPathMorris Jobke2016-02-141-14/+29
* | | Merge pull request #22381 from owncloud/remove-not-needed-variableThomas Müller2016-02-151-1/+0
|\ \ \
| * | | Remove not needed variableMorris Jobke2016-02-141-1/+0
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-156-0/+10
* | | Merge pull request #22380 from owncloud/make-scrutinizer-happyThomas Müller2016-02-152-2/+2
|\ \ \
| * | | Fix typo in PHPDocMorris Jobke2016-02-142-2/+2
| |/ /
* / / Remove unreachable code in priavte/api.phpMorris Jobke2016-02-141-5/+0
|/ /
* | Fix BMP supportMorris Jobke2016-02-141-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-142-0/+2
* | Merge pull request #22345 from owncloud/make-note-if-appcodechecker-is-not-en...Thomas Müller2016-02-131-2/+0
|\ \
| * | Add note if integrity check is disabledLukas Reschke2016-02-121-2/+0
* | | Merge pull request #22343 from owncloud/check-if-admin-userThomas Müller2016-02-131-1/+1
|\ \ \
| * | | Check if admin userLukas Reschke2016-02-121-1/+1
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1310-0/+12
* | | Always set up a config object within the user objectMorris Jobke2016-02-121-15/+10
* | | Merge pull request #22309 from owncloud/infinite-recursion-on-expired-linkThomas Müller2016-02-121-2/+2
|\ \ \
| * | | Do not getShare in deleteShare, it's already there when deletingJoas Schilling2016-02-111-2/+2
* | | | Merge pull request #22317 from owncloud/fix_invisible_linksharesThomas Müller2016-02-122-0/+27
|\ \ \ \ | |_|/ / |/| | |
| * | | Add parent for invisible link sharesRoeland Jago Douma2016-02-112-0/+27
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-1284-84/+12
| |_|/ |/| |
* | | Merge pull request #22315 from owncloud/update-info-checker-requirementsThomas Müller2016-02-111-12/+5
|\ \ \
| * | | Update info checker requirementsJoas Schilling2016-02-111-12/+5
| | |/ | |/|
* | | Merge pull request #22264 from owncloud/read-version-from-info.xml-onlyThomas Müller2016-02-114-19/+6
|\ \ \
| * | | No longer evaluate appinfo/versionThomas Müller2016-02-104-19/+6
* | | | Merge pull request #22308 from owncloud/shorter-ttl-find-pathThomas Müller2016-02-111-1/+2
|\ \ \ \ | |_|_|/ |/| | |