summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-242-0/+12
|
* [tx-robot] updated from transifexNextcloud bot2017-04-232-0/+10
|
* [tx-robot] updated from transifexNextcloud bot2017-04-224-0/+18
|
* Merge pull request #4396 from nextcloud/scan-non-existingRoeland Jago Douma2017-04-211-0/+5
|\ | | | | show error when trying to scan non existing path
| * check for existence before we start the db transactionRobin Appelman2017-04-201-3/+3
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Add PHPDoc and handle exception in ScanAppData as wellMorris Jobke2017-04-191-0/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * show error when trying to scan non existing pathRobin Appelman2017-04-191-0/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4428 from nextcloud/file-by-id-limit-userRoeland Jago Douma2017-04-213-6/+19
|\ \ | | | | | | limit the user when searching for a file by id if we know the user already
| * | limit the user when searching for a file by id if we know the user alreadyRobin Appelman2017-04-213-6/+19
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #4406 from nextcloud/fix-unit-test-problemsRoeland Jago Douma2017-04-214-92/+1
|\ \ \ | | | | | | | | Fix unit test problems
| * | | Fix theming testsJoas Schilling2017-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to configure method "shouldReplaceIcons" which cannot be configured because it does not exist, has not been specified, is final, or is static Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Kill dead codeJoas Schilling2017-04-203-91/+0
| |/ / | | | | | | | | | | | | | | | > No tests found in class "Test\Share\MailNotificationsTest". Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-2114-0/+32
| | |
* | | respect password policy for auto generated passwordsBjoern Schiessle2017-04-201-1/+3
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | allow admin to enforce password on mail sharesBjoern Schiessle2017-04-201-1/+2
|/ / | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #4398 from nextcloud/fix_accesslistcodeJoas Schilling2017-04-201-2/+7
|\ \ | | | | | | Get proper accesslist for userFolder
| * | Get proper accesslist for userFolderRoeland Jago Douma2017-04-201-2/+7
| |/ | | | | | | | | | | | | If the accesslist is requested for a users root folder we should properly construct the path Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #4381 from nextcloud/2954_take_2Joas Schilling2017-04-201-7/+1
|\ \ | | | | | | Fix group settings routes and fix route regression
| * | Revert "Match slashes in ../{id} resource routes"Roeland Jago Douma2017-04-181-7/+1
| | | | | | | | | | | | | | | | | | This reverts commit 31f9be7a75712e9f8b7831ed29397527f9fa8baf. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-2014-2/+58
| | |
* | | Rename renderHTML to renderHtmlMorris Jobke2017-04-192-4/+4
| |/ |/| | | | | | | | | | | * fixes #4383 * improves consistency Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4382 from nextcloud/use-proper-reply-toLukas Reschke2017-04-191-1/+3
|\ \ | | | | | | Add "Reply-To" on ShareByMailProvider mails
| * | Add "Reply-To" on ShareByMailProvider mailsLukas Reschke2017-04-181-1/+3
| |/ | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4209 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4371 from nextcloud/dont-allow-dot-usernamesMorris Jobke2017-04-181-1/+5
|\ \ | | | | | | Better validation of allowed user names
| * | Better validation of allowed user namesJoas Schilling2017-04-181-1/+5
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-04-192-0/+8
| |
* | [tx-robot] updated from transifexNextcloud bot2017-04-1848-148/+96
| |
* | Merge pull request #4369 from nextcloud/fix-translationsMorris Jobke2017-04-186-8/+8
|\ \ | | | | | | Fix translations
| * | Fix translationsJoas Schilling2017-04-186-8/+8
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4380 from nextcloud/show-instance-name-in-fromMorris Jobke2017-04-181-1/+1
|\ \ | | | | | | Add instance name to default sender
| * | Add instance name to default senderLukas Reschke2017-04-181-1/+1
| |/ | | | | | | | | | | Otherwise your mail program shows "foo@mail.com" instead of "Nextcloud" or whatever your instance name is. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / Don't put the SMTP password into the HTML codeJoas Schilling2017-04-181-0/+4
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2017-04-186-6/+12
|
* [tx-robot] updated from transifexNextcloud bot2017-04-172-0/+10
|
* [tx-robot] updated from transifexNextcloud bot2017-04-162-104/+104
|
* Merge pull request #2834 from nextcloud/accesListToShareManagerMorris Jobke2017-04-1510-23/+569
|\ | | | | Access list to share manager
| * Update autoloaderRoeland Jago Douma2017-04-132-0/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Fix server container registrationRoeland Jago Douma2017-04-131-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Not needed in the DIContainer anymoreRoeland Jago Douma2017-04-131-6/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Do not set full path if not currentAccessRoeland Jago Douma2017-04-131-6/+11
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add samples to the docsJoas Schilling2017-04-131-0/+38
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Catch exceptions and use as many results as possibleJoas Schilling2017-04-131-24/+59
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Adjust docs and make !$currentAccess simplerJoas Schilling2017-04-135-28/+58
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix default share providerJoas Schilling2017-04-131-6/+7
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix tests for ShareHelperJoas Schilling2017-04-131-0/+15
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix returned paths for remote sharesJoas Schilling2017-04-134-23/+12
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Return the token as wellJoas Schilling2017-04-131-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Also return the tokenJoas Schilling2017-04-131-5/+11
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Return the paths for the users without setting them all upJoas Schilling2017-04-137-50/+161
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix commentsRoeland Jago Douma2017-04-135-3/+61
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>