summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2606 from temparus/masterblizzz2017-02-151-3/+6
|\ | | | | Add preLoginValidation hook
| * Update license headerSandro Lutz2017-02-071-0/+2
| | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * Merge remote-tracking branch 'nextcloud/master'Sandro Lutz2017-02-0792-3285/+1933
| |\ | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | Add check if UserManager is of type PublicEmitter before calling preLogin hookSandro Lutz2017-02-011-1/+3
| | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | Change where preLogin hook gets calledSandro Lutz2017-02-011-3/+2
| | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | Remove preLoginValidation hookSandro Lutz2017-02-011-3/+0
| | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | Fix indentationSandro Lutz2017-02-011-3/+3
| | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
| * | Add preLoginValidation hookSandro Lutz2017-02-011-0/+3
| | | | | | | | | | | | Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
* | | Merge pull request #3495 from nextcloud/dav-protectedRoeland Jago Douma2017-02-151-7/+7
|\ \ \ | | | | | | | | Make it easier to subclass DAV storage
| * | | Make it easier to subclass DAV storageRobin Appelman2017-02-151-7/+7
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #3447 from nextcloud/getmetadata-permissions-maskRoeland Jago Douma2017-02-152-1/+10
|\ \ \ \ | | | | | | | | | | also apply permissions mask in getMetaData
| * | | | also apply permissions mask in getMetaDataRobin Appelman2017-02-102-1/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #3262 from nextcloud/jail-scanner-storage-idRoeland Jago Douma2017-02-153-7/+3
|\ \ \ \ \ | | | | | | | | | | | | Make sure we use the correct storage id and parent id when scanning a jailed storage
| * | | | | Make sure we use the correct storage id when scanning a jailed storageRobin Appelman2017-01-253-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injectionMorris Jobke2017-02-142-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix DI of the cloud id manager into apps
| * | | | | | Fix DI of the cloud id manager into appsJoas Schilling2017-02-142-0/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3472 from nextcloud/enable-avatars-alwaysMorris Jobke2017-02-143-6/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Always enable avatars
| * | | | | | Always enable avatarsMorris Jobke2017-02-133-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * we introduced this setting in the begining because our avatar support caused some performance issues, but we fixed them and should only provide one way how Nextcloud looks Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #3465 from nextcloud/storage-log-locksLukas Reschke2017-02-142-3/+84
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add option to enable locking debug logging
| * | | | | | Add missing PHPDoc and properly throw exceptionMorris Jobke2017-02-132-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Add storage to log item as wellLukas Reschke2017-02-131-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | | Add option to enable locking debug loggingRobin Appelman2017-02-131-3/+48
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #3444 from nextcloud/recognize-bat-and-cmdMorris Jobke2017-02-131-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Recognize .bat and .cmd files
| * | | | | | Recognize .bat and .cmd filesJoas Schilling2017-02-101-0/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3448 from kuimovvg/masterLukas Reschke2017-02-131-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | bug when connect to yandex webdav server
| * | | | | bug when connect to yandex webdav servervkuimov2017-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server think that request like <?xml version="1.0" encoding="UTF-8"?> <d:propfind xmlns:d="DAV:"> <d:prop/> </d:propfind> is 400: Bad Request
* | | | | | Merge pull request #3417 from nextcloud/push-notificationMorris Jobke2017-02-102-2/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | Push notification
| * | | | | | Make sure to use the right appdata directoryJoas Schilling2017-02-091-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Save the used token id in the session so it can be used later onJoas Schilling2017-02-091-2/+20
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3430 from nextcloud/fix-ios-client-detectionMorris Jobke2017-02-101-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix detection of the new iOS app
| * | | | | Fix detection of the new iOS appJoas Schilling2017-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3424 from nextcloud/fix-upgrade-pathBjörn Schießle2017-02-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix return value of getAllowedPreviousVersions()
| * | | | | | Fix return value of getAllowedPreviousVersions()Morris Jobke2017-02-091-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / / / Set vendor during installMorris Jobke2017-02-091-0/+15
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3297 from nextcloud/cloud-id-resolveRobin Appelman2017-02-096-40/+209
|\ \ \ \ \ | | | | | | | | | | | | Add a single public api for resolving a cloud id to a user and remote and back
| * | | | | fix copyright headersRobin Appelman2017-02-092-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | clean cloud idsRobin Appelman2017-02-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | add testsRobin Appelman2017-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Add a single public api for resolving a cloud id to a user and remote and backRobin Appelman2017-02-086-40/+206
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #3184 from nextcloud/issue-3165Lukas Reschke2017-02-091-20/+16
|\ \ \ \ \ | | | | | | | | | | | | Prevent migration from ownCloud 11 to Nextcloud 12
| * | | | | Prevent migration from ownCloud 11 to Nextcloud 12Joas Schilling2017-01-231-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3408 from nextcloud/nullstorage-free-spaceJoas Schilling2017-02-091-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | return unknown free space from nullstorage
| * | | | | | return unknown free space from nullstorageRobin Appelman2017-02-081-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | 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 exception
| * | | | | | Don't log the password on confirmPassword when LDAP throws an exceptionJoas Schilling2017-02-071-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-nameJoas Schilling2017-02-091-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | oc_token should be nc_token
| * | | | | oc_token should be nc_tokenChristoph Wurst2017-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #3352 from nextcloud/public-page-guest-css-loaderMorris Jobke2017-02-061-1/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix public page css fallback loading
| * | | | | Fix public page css fallback loadingJohn Molakvoæ (skjnldsv)2017-02-011-1/+5
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* / / / / Lower log levels of resource locatorRobin Appelman2017-02-032-4/+4
|/ / / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>