summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3444 from nextcloud/recognize-bat-and-cmdMorris Jobke2017-02-133-3/+20
|\ | | | | Recognize .bat and .cmd files
| * Recognize .bat and .cmd filesJoas Schilling2017-02-103-3/+20
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #3324 from nextcloud/fix-2431Lukas Reschke2017-02-133-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 #2431Arthur Schiwon2017-01-303-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/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-1316-60/+248
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-1230-10/+314
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-02-11212-1336/+1732
| | | |
* | | | 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-105-11/+10
|\ \ \ \ \ | | | | | | | | | | | | Fix detection of the new iOS app
| * | | | | Fix detection of the new iOS appJoas Schilling2017-02-105-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #3443 from nextcloud/add-integration-tests-for-davblizzz2017-02-108-31/+90
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add integration tests for legacy DAV endpoints
| * | | | | | Add integration tests for legacy DAV endpointsLukas Reschke2017-02-108-31/+90
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #3371 from m3ntalsp00n/reload_countdownblizzz2017-02-102-4/+40
|\ \ \ \ \ \ | |/ / / / / |/| | | | | showUpdate funciton allows updated messages
| * | | | | Fix indentation and l10n compliance.m3ntalsp00n2017-02-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
| * | | | | fix tests, longer wait time, update notification stubm3ntalsp00n2017-02-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
| * | | | | showUpdate funciton allows updated messagesm3ntalsp00n2017-02-041-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.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>
* | | | | | Merge pull request #3425 from nextcloud/set-vendor-during-installBjörn Schießle2017-02-101-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Set vendor during install
| * | | | | | Set vendor during installMorris Jobke2017-02-091-0/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3181 from nextcloud/fix-favorite-activity-mailBjörn Schießle2017-02-102-12/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make sure the file information is available when sending the email
| * | | | | | Make sure the file information is available when sending the emailJoas Schilling2017-01-202-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #3429 from nextcloud/oparoz-issuetemplateJoas Schilling2017-02-101-0/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix issue template log formatting
| * | | | | | Fix log formattingOlivier Paroz2017-02-101-0/+3
|/ / / / / /
* | | | | | Merge pull request #3422 from nextcloud/transifexMorris Jobke2017-02-092-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | add transifex config for sharebymail
| * | | | | | add transifex config for sharebymailMorris Jobke2017-02-092-0/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-02-1018-6/+42
| | | | | |
* | | | | | Merge pull request #3297 from nextcloud/cloud-id-resolveRobin Appelman2017-02-0935-231/+707
|\ \ \ \ \ \ | | | | | | | | | | | | | | 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-093-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | add testsRobin Appelman2017-02-083-1/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | register cloudidmanager for files_sharingRobin Appelman2017-02-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | log ocs exceptionsRobin Appelman2017-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | remove test for removed codeRobin Appelman2017-02-081-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 backRobin Appelman2017-02-0832-209/+550
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #3184 from nextcloud/issue-3165Lukas Reschke2017-02-093-105/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | Prevent migration from ownCloud 11 to Nextcloud 12
| * | | | | | Prevent migration from ownCloud 11 to Nextcloud 12Joas Schilling2017-01-233-105/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #3408 from nextcloud/nullstorage-free-spaceJoas Schilling2017-02-092-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | return unknown free space from nullstorage
| * | | | | | | Fix unit testsMorris Jobke2017-02-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | 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 #3407 from ↵Björn Schießle2017-02-091-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 wellJoas Schilling2017-02-081-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | | Merge pull request #3362 from nextcloud/fix/nc-token-cookie-nameJoas Schilling2017-02-094-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | oc_token should be nc_token
| * | | | | | | | oc_token should be nc_tokenChristoph Wurst2017-02-024-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>