summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3495 from nextcloud/dav-protectedRoeland Jago Douma2017-02-151-7/+7
|\
| * Make it easier to subclass DAV storageRobin Appelman2017-02-151-7/+7
* | Merge pull request #3447 from nextcloud/getmetadata-permissions-maskRoeland Jago Douma2017-02-152-1/+10
|\ \
| * | also apply permissions mask in getMetaDataRobin Appelman2017-02-102-1/+10
* | | Merge pull request #3262 from nextcloud/jail-scanner-storage-idRoeland Jago Douma2017-02-153-7/+3
|\ \ \
| * | | Make sure we use the correct storage id when scanning a jailed storageRobin Appelman2017-01-253-7/+3
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-152-0/+16
* | | | Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injectionMorris Jobke2017-02-142-0/+6
|\ \ \ \
| * | | | Fix DI of the cloud id manager into appsJoas Schilling2017-02-142-0/+6
| | |_|/ | |/| |
* | | | Merge pull request #3472 from nextcloud/enable-avatars-alwaysMorris Jobke2017-02-143-6/+3
|\ \ \ \
| * | | | Always enable avatarsMorris Jobke2017-02-133-6/+3
* | | | | Merge pull request #3465 from nextcloud/storage-log-locksLukas Reschke2017-02-144-3/+86
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add missing PHPDoc and properly throw exceptionMorris Jobke2017-02-134-0/+8
| * | | | Add storage to log item as wellLukas Reschke2017-02-131-3/+33
| * | | | Add option to enable locking debug loggingRobin Appelman2017-02-131-3/+48
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-144-4/+376
* | | | Merge pull request #3444 from nextcloud/recognize-bat-and-cmdMorris Jobke2017-02-131-0/+14
|\ \ \ \
| * | | | Recognize .bat and .cmd filesJoas Schilling2017-02-101-0/+14
| | |_|/ | |/| |
* | | | Merge pull request #3448 from kuimovvg/masterLukas Reschke2017-02-131-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | bug when connect to yandex webdav servervkuimov2017-02-101-1/+1
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-132-0/+2
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-116-10/+504
* | | | Merge pull request #3417 from nextcloud/push-notificationMorris Jobke2017-02-102-2/+27
|\ \ \ \
| * | | | Make sure to use the right appdata directoryJoas Schilling2017-02-091-0/+7
| * | | | Save the used token id in the session so it can be used later onJoas Schilling2017-02-091-2/+20
| |/ / /
* | | | Merge pull request #3430 from nextcloud/fix-ios-client-detectionMorris Jobke2017-02-102-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix detection of the new iOS appJoas Schilling2017-02-102-2/+2
* | | | Merge pull request #3424 from nextcloud/fix-upgrade-pathBjörn Schießle2017-02-101-1/+1
|\ \ \ \
| * | | | Fix return value of getAllowedPreviousVersions()Morris Jobke2017-02-091-1/+1
| |/ / /
* / / / Set vendor during installMorris Jobke2017-02-091-0/+15
|/ / /
* | | Merge pull request #3297 from nextcloud/cloud-id-resolveRobin Appelman2017-02-0911-40/+340
|\ \ \
| * | | fix copyright headersRobin Appelman2017-02-094-3/+11
| * | | clean cloud idsRobin Appelman2017-02-091-3/+2
| * | | add testsRobin Appelman2017-02-081-1/+1
| * | | Add a single public api for resolving a cloud id to a user and remote and backRobin Appelman2017-02-0811-40/+333
| |/ /
* | | Merge pull request #3184 from nextcloud/issue-3165Lukas Reschke2017-02-091-20/+16
|\ \ \
| * | | Prevent migration from ownCloud 11 to Nextcloud 12Joas Schilling2017-01-231-20/+16
* | | | Merge pull request #3408 from nextcloud/nullstorage-free-spaceJoas Schilling2017-02-091-1/+2
|\ \ \ \
| * | | | return unknown free space from nullstorageRobin Appelman2017-02-081-1/+2
| | |/ / | |/| |
* | | | Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmationLukas Reschke2017-02-091-1/+2
|\ \ \ \
| * | | | Don't log the password on confirmPassword when LDAP throws an exceptionJoas Schilling2017-02-071-1/+2
* | | | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-nameJoas Schilling2017-02-091-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | oc_token should be nc_tokenChristoph Wurst2017-02-021-1/+1
* | | | | [tx-robot] updated from transifexNextcloud bot2017-02-082-0/+352
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-072-0/+396
* | | | Merge pull request #3352 from nextcloud/public-page-guest-css-loaderMorris Jobke2017-02-062-5/+5
|\ \ \ \
| * | | | Fix public page css fallback loadingJohn Molakvoæ (skjnldsv)2017-02-012-5/+5
* | | | | Merge pull request #3364 from nextcloud/sass-loggingRobin Appelman2017-02-062-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Lower log levels of resource locatorRobin Appelman2017-02-032-4/+4
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2017-02-022-10/+10
|/ / /