summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [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 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-144-3/+86
|\ \ \ | |_|/ |/| | Add option to enable locking debug logging
| * | Add missing PHPDoc and properly throw exceptionMorris Jobke2017-02-134-0/+8
| | | | | | | | | | | | 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>
* | [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 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
* | | [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
|\ \ \ | | | | | | | | 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-102-2/+2
|\ \ \ | |_|/ |/| | Fix detection of the new iOS app
| * | Fix detection of the new iOS appJoas Schilling2017-02-102-2/+2
| | | | | | | | | | | | 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-0911-40/+340
|\ \ | | | | | | Add a single public api for resolving a cloud id to a user and remote and back
| * | fix copyright headersRobin Appelman2017-02-094-3/+11
| | | | | | | | | | | | 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-0811-40/+333
| |/ | | | | | | 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>
* | | | [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 loading
| * | | Fix public page css fallback loadingJohn Molakvoæ (skjnldsv)2017-02-012-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #3364 from nextcloud/sass-loggingRobin Appelman2017-02-062-4/+4
|\ \ \ \ | |_|/ / |/| | | Lower log levels of resource locator
| * | | Lower log levels of resource locatorRobin Appelman2017-02-032-4/+4
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* / / [tx-robot] updated from transifexNextcloud bot2017-02-022-10/+10
|/ /
* | Merge pull request #3321 from ↵Morris Jobke2017-01-312-3/+3
|\ \ | | | | | | | | | | | | nextcloud/revert-unintentional-change-of-log-timestamp-format Revert unintentional log timestamp format change
| * | Revert unintentional log timestamp format changeJoas Schilling2017-01-302-3/+3
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #2044 from nextcloud/login-credential-storeMorris Jobke2017-01-3010-22/+357
|\ \ \ | | | | | | | | Login credential store
| * | | always allow remembered loginChristoph Wurst2017-01-111-21/+0
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | do not hard-require the token providerChristoph Wurst2017-01-112-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The provider might need DB access and therefore depenedency resolution fails on the setup page where we cannot inject the db implementation. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | use login hook credentials as fallbackChristoph Wurst2017-01-111-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If no session token is available, we can use the credentials provided by the login hook. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>