summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-04-2280-140/+356
|
* Merge pull request #4396 from nextcloud/scan-non-existingRoeland Jago Douma2017-04-212-7/+14
|\ | | | | show error when trying to scan non existing path
| * Add PHPDoc and handle exception in ScanAppData as wellMorris Jobke2017-04-191-0/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * show error when trying to scan non existing pathRobin Appelman2017-04-191-7/+12
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Use RESPOND_NOT_FOUND for non existing userMorris Jobke2017-04-212-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4422 from nextcloud/favorite-wording-detailRoeland Jago Douma2017-04-211-2/+1
|\ \ | | | | | | Wording detail fix for favorite emptycontent view
| * | Wording detail fix for favorite emptycontent viewJan-Christoph Borchardt2017-04-211-2/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #4423 from nextcloud/reload-fav-viewMorris Jobke2017-04-211-0/+6
|\ \ \ | |/ / |/| | properly reload favorites list
| * | properly reload favorites listRobin Appelman2017-04-211-0/+6
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | No need to log guzzle exceptionRoeland Jago Douma2017-04-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When getting/requesting a shared secret there is no need to log the full exception when an unexpected status code is returned since this won't really tell us anything as the bad stuff happened on a remote server Fixes #3380 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4406 from nextcloud/fix-unit-test-problemsRoeland Jago Douma2017-04-215-20/+31
|\ \ \ | | | | | | | | Fix unit test problems
| * | | Fix invalid Dav testJoas Schilling2017-04-202-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP Warning: Declaration of PublicCalendarTest::testPrivateClassification() should be compatible with CalendarTest::testPrivateClassification($expectedChildren, $isShared) in apps/dav/tests/unit/CalDAV/PublicCalendarTest.php on line 29 Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix theming testsJoas Schilling2017-04-202-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Don't use deprecated getMock() anymoreJoas Schilling2017-04-201-3/+4
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #4408 from nextcloud/accesslist_ngRoeland Jago Douma2017-04-212-14/+18
|\ \ \ | | | | | | | | Move systemtags and comments to new accesslist functions
| * | | Move systemtags and comments to new accesslist functionsRoeland Jago Douma2017-04-202-14/+18
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-218-0/+20
| | | |
* | | | Merge pull request #4412 from individual-it/masterMorris Jobke2017-04-201-1/+0
|\ \ \ \ | | | | | | | | | | deleted forgotten code in test
| * | | | deleted forgotten code in testArtur Neumann2017-04-201-1/+0
| | | | | | | | | | | | | | | | | | | | how embarrassing, left code from before I've done the loop around the test Signed-off-by: Artur Neumann <info@individual-it.net>
* | | | | Merge pull request #4404 from Ardinis/masterMorris Jobke2017-04-201-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Remove json handling for files_external:config
| * | | | | reviewedArdinis2017-04-201-0/+7
| | | | | |
| * | | | | Remove json handling for files_external:configArdinis2017-04-141-7/+0
| | | | | | | | | | | | | | | | | | #4347
* | | | | | Merge pull request #3595 from nextcloud/dav-sharing-changesMorris Jobke2017-04-205-62/+85
|\ \ \ \ \ \ | | | | | | | | | | | | | | Restrict DAV share handling to the owner only
| * | | | | | Fix unit testsMorris Jobke2017-04-202-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Fix remaining "PHP Inspection" warningsJoas Schilling2017-04-202-34/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Add public access modifier to all methodsJoas Schilling2017-04-202-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Restrict share handling to the owner onlyJoas Schilling2017-04-203-8/+34
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise group members can remove the share for the complete group, remove edit permissions and even single user shares for other users. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #4402 from nextcloud/fix-clickable-areaBjörn Schießle2017-04-201-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix clickable area in share permissions menu
| * | | | | | Fix clickable area in share permissions menuMorris Jobke2017-04-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | fix typoMorris Jobke2017-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Fix casingMorris Jobke2017-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | fix unit testsBjoern Schiessle2017-04-202-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | respect password policy for auto generated passwordsBjoern Schiessle2017-04-202-5/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | improve mail textBjoern Schiessle2017-04-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | create activity if a password was send by mailBjoern Schiessle2017-04-202-24/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | templates no longer neededBjoern Schiessle2017-04-202-91/+0
| | | | | | |
* | | | | | | allow admin to enforce password on mail sharesBjoern Schiessle2017-04-2012-30/+313
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | Merge pull request #4212 from individual-it/masterJoas Schilling2017-04-202-38/+149
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | validate file name before uploading in upload only folder
| * | | | remove accidently left over *f*itArtur Neumann2017-04-181-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Artur Neumann <info@individual-it.net>
| * | | | JS tests for upload only functionArtur Neumann2017-04-181-0/+99
| | | | | | | | | | | | | | | Signed-off-by: Artur Neumann <info@individual-it.net>
| * | | | refactor to make it easier to testArtur Neumann2017-04-181-45/+50
| | | | | | | | | | | | | | | Signed-off-by: Artur Neumann <info@individual-it.net>
| * | | | validate file name before uploading in upload only folderArtur Neumann2017-04-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | fixes #4211 Signed-off-by: Artur Neumann <info@individual-it.net>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-2078-24/+176
| | | | |
* | | | | Rename renderHTML to renderHtmlMorris Jobke2017-04-192-4/+4
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * fixes #4383 * improves consistency Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Improve menu CSSMorris Jobke2017-04-192-65/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix mess with menus and actions in the files app * reduces amount of !important usages * keeps the behaviour on mobile as well as on desktop Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4385 from nextcloud/remove-unused-cssRoeland Jago Douma2017-04-191-51/+5
|\ \ \ \ | |_|_|/ |/| | | Remove unused CSS
| * | | Remove unused CSSMorris Jobke2017-04-181-51/+5
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4382 from nextcloud/use-proper-reply-toLukas Reschke2017-04-192-9/+286
|\ \ \ \ | | | | | | | | | | Add "Reply-To" on ShareByMailProvider mails
| * | | | Fix indentationLukas Reschke2017-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | Add "Reply-To" on ShareByMailProvider mailsLukas Reschke2017-04-182-9/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4209 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>