Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3444 from nextcloud/recognize-bat-and-cmd | Morris Jobke | 2017-02-13 | 3 | -3/+20 |
|\ | | | | | Recognize .bat and .cmd files | ||||
| * | Recognize .bat and .cmd files | Joas Schilling | 2017-02-10 | 3 | -3/+20 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #3324 from nextcloud/fix-2431 | Lukas Reschke | 2017-02-13 | 3 | -36/+85 |
|\ \ | | | | | | | LDAP's checkPassword should only catch when a user was not found, fixes #2431 | ||||
| * | | LDAP's checkPassword should only catch when a user was not found, fixes #2431 | Arthur Schiwon | 2017-01-30 | 3 | -36/+85 |
| | | | | | | | | | | | | | | | | | | Also fixes error processing after ldap_search, due to different return format Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | | 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 | 16 | -60/+248 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-12 | 30 | -10/+314 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-11 | 212 | -1336/+1732 |
| | | | | |||||
* | | | | 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 | 5 | -11/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix detection of the new iOS app | ||||
| * | | | | | Fix detection of the new iOS app | Joas Schilling | 2017-02-10 | 5 | -11/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | | Merge pull request #3443 from nextcloud/add-integration-tests-for-dav | blizzz | 2017-02-10 | 8 | -31/+90 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add integration tests for legacy DAV endpoints | ||||
| * | | | | | | Add integration tests for legacy DAV endpoints | Lukas Reschke | 2017-02-10 | 8 | -31/+90 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | | | | Merge pull request #3371 from m3ntalsp00n/reload_countdown | blizzz | 2017-02-10 | 2 | -4/+40 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | showUpdate funciton allows updated messages | ||||
| * | | | | | Fix indentation and l10n compliance. | m3ntalsp00n | 2017-02-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com> | ||||
| * | | | | | fix tests, longer wait time, update notification stub | m3ntalsp00n | 2017-02-04 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com> | ||||
| * | | | | | showUpdate funciton allows updated messages | m3ntalsp00n | 2017-02-04 | 1 | -2/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.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> | ||||
* | | | | | | Merge pull request #3425 from nextcloud/set-vendor-during-install | Björn Schießle | 2017-02-10 | 1 | -0/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Set vendor during install | ||||
| * | | | | | | Set vendor during install | Morris Jobke | 2017-02-09 | 1 | -0/+15 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | | Merge pull request #3181 from nextcloud/fix-favorite-activity-mail | Björn Schießle | 2017-02-10 | 2 | -12/+28 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make sure the file information is available when sending the email | ||||
| * | | | | | | Make sure the file information is available when sending the email | Joas Schilling | 2017-01-20 | 2 | -12/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | | | Merge pull request #3429 from nextcloud/oparoz-issuetemplate | Joas Schilling | 2017-02-10 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Fix issue template log formatting | ||||
| * | | | | | | Fix log formatting | Olivier Paroz | 2017-02-10 | 1 | -0/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3422 from nextcloud/transifex | Morris Jobke | 2017-02-09 | 2 | -0/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | add transifex config for sharebymail | ||||
| * | | | | | | add transifex config for sharebymail | Morris Jobke | 2017-02-09 | 2 | -0/+6 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-02-10 | 18 | -6/+42 |
| | | | | | | |||||
* | | | | | | Merge pull request #3297 from nextcloud/cloud-id-resolve | Robin Appelman | 2017-02-09 | 35 | -231/+707 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | 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 | 3 | -11/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | | add tests | Robin Appelman | 2017-02-08 | 3 | -1/+146 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | | register cloudidmanager for files_sharing | Robin Appelman | 2017-02-08 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | | log ocs exceptions | Robin Appelman | 2017-02-08 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | | | remove test for removed code | Robin Appelman | 2017-02-08 | 1 | -22/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 32 | -209/+550 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | | | Merge pull request #3184 from nextcloud/issue-3165 | Lukas Reschke | 2017-02-09 | 3 | -105/+48 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Prevent migration from ownCloud 11 to Nextcloud 12 | ||||
| * | | | | | | Prevent migration from ownCloud 11 to Nextcloud 12 | Joas Schilling | 2017-01-23 | 3 | -105/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | | | Merge pull request #3408 from nextcloud/nullstorage-free-space | Joas Schilling | 2017-02-09 | 2 | -2/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | return unknown free space from nullstorage | ||||
| * | | | | | | | Fix unit tests | Morris Jobke | 2017-02-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | | | | 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 #3407 from ↵ | Björn Schießle | 2017-02-09 | 1 | -0/+17 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-3312-user-settings-email-accounts-table Update the email in the accounts table as well | ||||
| * | | | | | | | | Update the email in the accounts table as well | Joas Schilling | 2017-02-08 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | | | | | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name | Joas Schilling | 2017-02-09 | 4 | -5/+5 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | oc_token should be nc_token | ||||
| * | | | | | | | | oc_token should be nc_token | Christoph Wurst | 2017-02-02 | 4 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> |