Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-15 | 2 | -0/+16 |
| | |||||
* | Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injection | Morris Jobke | 2017-02-14 | 2 | -0/+6 |
|\ | | | | | Fix DI of the cloud id manager into apps | ||||
| * | Fix DI of the cloud id manager into apps | Joas Schilling | 2017-02-14 | 2 | -0/+6 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #3472 from nextcloud/enable-avatars-always | Morris Jobke | 2017-02-14 | 3 | -6/+3 |
|\ \ | | | | | | | Always enable avatars | ||||
| * | | Always enable avatars | Morris Jobke | 2017-02-13 | 3 | -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-locks | Lukas Reschke | 2017-02-14 | 4 | -3/+86 |
|\ \ \ | |_|/ |/| | | Add option to enable locking debug logging | ||||
| * | | Add missing PHPDoc and properly throw exception | Morris Jobke | 2017-02-13 | 4 | -0/+8 |
| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | Add storage to log item as well | Lukas Reschke | 2017-02-13 | 1 | -3/+33 |
| | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Add option to enable locking debug logging | Robin Appelman | 2017-02-13 | 1 | -3/+48 |
| |/ | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-14 | 4 | -4/+376 |
| | | |||||
* | | Merge pull request #3444 from nextcloud/recognize-bat-and-cmd | Morris Jobke | 2017-02-13 | 1 | -0/+14 |
|\ \ | | | | | | | Recognize .bat and .cmd files | ||||
| * | | Recognize .bat and .cmd files | Joas Schilling | 2017-02-10 | 1 | -0/+14 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #3448 from kuimovvg/master | Lukas Reschke | 2017-02-13 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | bug when connect to yandex webdav server | ||||
| * | | bug when connect to yandex webdav server | vkuimov | 2017-02-10 | 1 | -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 transifex | Nextcloud bot | 2017-02-13 | 2 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-11 | 6 | -10/+504 |
| | | | |||||
* | | | Merge pull request #3417 from nextcloud/push-notification | Morris Jobke | 2017-02-10 | 2 | -2/+27 |
|\ \ \ | | | | | | | | | Push notification | ||||
| * | | | Make sure to use the right appdata directory | Joas Schilling | 2017-02-09 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | | Save the used token id in the session so it can be used later on | Joas Schilling | 2017-02-09 | 1 | -2/+20 |
| |/ / | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #3430 from nextcloud/fix-ios-client-detection | Morris Jobke | 2017-02-10 | 2 | -2/+2 |
|\ \ \ | |_|/ |/| | | Fix detection of the new iOS app | ||||
| * | | Fix detection of the new iOS app | Joas Schilling | 2017-02-10 | 2 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #3424 from nextcloud/fix-upgrade-path | Björn Schießle | 2017-02-10 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix return value of getAllowedPreviousVersions() | ||||
| * | | | Fix return value of getAllowedPreviousVersions() | Morris Jobke | 2017-02-09 | 1 | -1/+1 |
| |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* / / | Set vendor during install | Morris Jobke | 2017-02-09 | 1 | -0/+15 |
|/ / | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | Merge pull request #3297 from nextcloud/cloud-id-resolve | Robin Appelman | 2017-02-09 | 11 | -40/+340 |
|\ \ | | | | | | | Add a single public api for resolving a cloud id to a user and remote and back | ||||
| * | | fix copyright headers | Robin Appelman | 2017-02-09 | 4 | -3/+11 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | clean cloud ids | Robin Appelman | 2017-02-09 | 1 | -3/+2 |
| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | add tests | Robin Appelman | 2017-02-08 | 1 | -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 back | Robin Appelman | 2017-02-08 | 11 | -40/+333 |
| |/ | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | Merge pull request #3184 from nextcloud/issue-3165 | Lukas Reschke | 2017-02-09 | 1 | -20/+16 |
|\ \ | | | | | | | Prevent migration from ownCloud 11 to Nextcloud 12 | ||||
| * | | Prevent migration from ownCloud 11 to Nextcloud 12 | Joas Schilling | 2017-01-23 | 1 | -20/+16 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #3408 from nextcloud/nullstorage-free-space | Joas Schilling | 2017-02-09 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | return unknown free space from nullstorage | ||||
| * | | | return unknown free space from nullstorage | Robin Appelman | 2017-02-08 | 1 | -1/+2 |
| | |/ | |/| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation | Lukas Reschke | 2017-02-09 | 1 | -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 exception | Joas Schilling | 2017-02-07 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name | Joas Schilling | 2017-02-09 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | oc_token should be nc_token | ||||
| * | | | oc_token should be nc_token | Christoph Wurst | 2017-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-08 | 2 | -0/+352 |
| |/ / |/| | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-07 | 2 | -0/+396 |
| | | | |||||
* | | | Merge pull request #3352 from nextcloud/public-page-guest-css-loader | Morris Jobke | 2017-02-06 | 2 | -5/+5 |
|\ \ \ | | | | | | | | | Fix public page css fallback loading | ||||
| * | | | Fix public page css fallback loading | John Molakvoæ (skjnldsv) | 2017-02-01 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | Merge pull request #3364 from nextcloud/sass-logging | Robin Appelman | 2017-02-06 | 2 | -4/+4 |
|\ \ \ \ | |_|/ / |/| | | | Lower log levels of resource locator | ||||
| * | | | Lower log levels of resource locator | Robin Appelman | 2017-02-03 | 2 | -4/+4 |
| |/ / | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-02 | 2 | -10/+10 |
|/ / | |||||
* | | Merge pull request #3321 from ↵ | Morris Jobke | 2017-01-31 | 2 | -3/+3 |
|\ \ | | | | | | | | | | | | | nextcloud/revert-unintentional-change-of-log-timestamp-format Revert unintentional log timestamp format change | ||||
| * | | Revert unintentional log timestamp format change | Joas Schilling | 2017-01-30 | 2 | -3/+3 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | Merge pull request #2044 from nextcloud/login-credential-store | Morris Jobke | 2017-01-30 | 10 | -22/+357 |
|\ \ \ | | | | | | | | | Login credential store | ||||
| * | | | always allow remembered login | Christoph Wurst | 2017-01-11 | 1 | -21/+0 |
| | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | do not hard-require the token provider | Christoph Wurst | 2017-01-11 | 2 | -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 fallback | Christoph Wurst | 2017-01-11 | 1 | -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> |