summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixes #13658Thomas Müller2016-02-111-1/+2
| | |/ | |/|
* / | Properly check for legacy methodsRoeland Jago Douma2016-02-112-3/+10
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-112-0/+2
* | Merge pull request #22285 from owncloud/fix_22275Thomas Müller2016-02-101-1/+5
|\ \
| * | Also filter the old share info endpointRoeland Jago Douma2016-02-101-1/+5
| |/
* | Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-...Thomas Müller2016-02-101-8/+16
|\ \
| * | Chunk the queries to make sure they don't time outJoas Schilling2016-02-101-8/+16
| |/
* | Merge pull request #22271 from owncloud/remember-login-stateThomas Müller2016-02-101-0/+1
|\ \
| * | refactoring codeVincent Chan2016-02-101-0/+1
| |/
* | Merge pull request #22267 from owncloud/fix_encryption2Thomas Müller2016-02-101-0/+4
|\ \ | |/ |/|
| * remember signature version and only set it on update to make sure that otherBjoern Schiessle2016-02-101-0/+4
* | Merge pull request #22256 from owncloud/hide-updater-secretThomas Müller2016-02-101-0/+1
|\ \ | |/ |/|
| * Hide updater.secret from occ output by defaultLukas Reschke2016-02-091-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-102-0/+4
* | Check if partial cache entry or not in encryption wrapperVincent Petry2016-02-091-2/+5
* | Use database for keeping track of the versionLukas Reschke2016-02-093-3/+18
* | Use number of chunk for HMAC as wellLukas Reschke2016-02-091-5/+13
* | fixing unit testsBjörn Schießle2016-02-091-0/+3
* | make it backward compatible to work with signed and un-signed filesBjörn Schießle2016-02-093-8/+15
* | Merge pull request #22192 from owncloud/fix_19685Thomas Müller2016-02-093-7/+35
|\ \
| * | Catch exceptionRoeland Jago Douma2016-02-091-4/+17