summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Fix Argon2 options checksMichaIng2020-04-301-0/+5
| | | | | | | | | | | The minimum for memory cost is 8 KiB per thread. Threads must be checked and set first to allow checking against the correct memory cost mimimum. Options are now applied the following way: - If config.php contains the setting with an integer higher or equal to the minimum, it is applied. - If config.php contains the setting with an integer lower than the minimum, the minimum is applied. - If config.php does not contain the setting or with no integer value, the PHP default is applied. Signed-off-by: MichaIng <micha@dietpi.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #19793 from nextcloud/bugfix/noid/link-to-federated-reshareMorris Jobke2020-04-271-18/+0
|\ | | | | Fix resharing of federated shares that were created out of links
| * Remove unneeded test since links have resharing permissions by defaultJulius Härtl2020-04-211-18/+0
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #19514 from sndrr/already-enabled-appsMorris Jobke2020-04-271-0/+1
|\ \ | | | | | | Already enabled apps
| * | Updated test to check for already enabled appsSander Ruitenbeek2020-04-241-0/+1
| | | | | | | | | | | | Signed-off-by: Sander Ruitenbeek <s.ruitenbeek@getgoing.nl>
* | | Merge pull request #19084 from nextcloud/bug/13556/wrong-paths-for-svgMorris Jobke2020-04-274-4/+92
|\ \ \ | | | | | | | | Make it possible to resolve svg's outside \OC::$SERVERROOT
| * | | Add test to ensure that symlinked apps_paths are not resolvedDaniel Kesselberg2020-04-241-0/+29
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Make it possible to resolve svg for apps_paths outside the document rootDaniel Kesselberg2020-04-243-4/+63
| | | | | | | | | | | | | | | | | | | | | | | | Previous implementation assumes the app path is always a child \OC::$SERVERROOT. That's not always true. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Allow specifying a default expiration dateRoeland Jago Douma2020-04-241-0/+1
| |/ / |/| | | | | | | | | | | | | | This overrides the max expiration date. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Do not create remember me cookieJulius Härtl2020-04-231-1/+24
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Fix new routing in settings etcRoeland Jago Douma2020-04-221-2/+2
| | | | | | | | | | | | | | | | | | Also prefix resources Unify the prefix handling Handle urls with and without slash Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #20114 from ↵Roeland Jago Douma2020-04-211-87/+50
|\ \ | |/ |/| | | | | nextcloud/techdebt/noid/allow-some-apps-to-have-root-urls Allow some apps to have root URLs in their own routing file
| * Extend tests for root urlJoas Schilling2020-04-181-87/+50
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Move to subfolders for preview filesRoeland Jago Douma2020-04-191-26/+70
|/ | | | | | | | | | | Else the number of files can grow very large very quickly in the preview folder. Esp on large systems. This generates the md5 of the fileid. And then creates folders of the first 7 charts. In that folder is then a folder with the fileid. And inside there are the previews. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Fix mailer testRoeland Jago Douma2020-04-171-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #20447 from liamjack/fix/13287/welcome_emailJohn Molakvoæ2020-04-172-2/+2
|\ | | | | Increase max-height on button in welcome email template
| * Fix testsMorris Jobke2020-04-172-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #20505 from nextcloud/fix/noid/system-credsblizzz2020-04-161-0/+33
|\ \ | | | | | | do not advertise nulled userId for for systemwide credentials
| * | fix credentialsManager documentation and ensure userId to be used as stringArthur Schiwon2020-04-151-3/+3
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | add DB tests for credentials managerArthur Schiwon2020-04-151-0/+33
| | | | | | | | | | | | | | | | | | | | | these are actually expected to FAIL, because NULL as a userid is not allowed in the schema, but documented to be used on the source Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Provide the proper language to the mailerRoeland Jago Douma2020-04-162-4/+11
| | | | | | | | | | | | | | | | | | | | | Else we can't properly translate the footer in the recipients e-mail language. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Run cs:fix and fix HashWrapper codeMorris Jobke2020-04-151-1/+3
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #20138 from ↵Joas Schilling2020-04-152-11/+126
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/make-remote-checking-more-generic Make remote checking more generic
| * | Fix unit testsJoas Schilling2020-04-151-2/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Check all remotes for local accessJoas Schilling2020-04-141-9/+122
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #20401 from nextcloud/fix/login-sso-redirctRoeland Jago Douma2020-04-151-4/+4
|\ \ \ | | | | | | | | Fix absolute redirect
| * | | Fix absolute redirectJohn Molakvoæ (skjnldsv)2020-04-101-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #19351 from nextcloud/dav-upload-hashRoeland Jago Douma2020-04-151-0/+55
|\ \ \ \ | |_|/ / |/| | | Return hashes of uploaded content for dav uploads
| * | | Return hashes of uploaded content for dav uploadsRobin Appelman2020-04-131-0/+55
| | |/ | |/| | | | | | | | | | | | | | | | | | | hashes are set in "X-Hash-MD5", "X-Hash-SHA1" and "X-Hash-SHA256" headers. these headers are set for file uploads and the MOVE request at the end of a multipart upload. Signed-off-by: Robin Appelman <robin@icewind.nl>
* / | Fix jsunit testsDaniel Kesselberg2020-04-141-6/+0
|/ / | | | | | | | | | | JSUnit tests are failing for some reason. It seems to be related to a new karma-coverage version published a few hours ago. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #20426 from nextcloud/techdebt/psr2John Molakvoæ2020-04-1143-163/+163
|\ \ | | | | | | It is done
| * | Add visibility to all constantsChristoph Wurst2020-04-107-22/+22
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Add visibility to all methods and position of static keywordChristoph Wurst2020-04-1034-128/+128
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Add visibility to all properties and move static keywordChristoph Wurst2020-04-105-13/+13
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #20419 from nextcloud/dependabot/npm_and_yarn/variousJohn Molakvoæ2020-04-111-4/+4
|\ \ \ | |/ / |/| | Bump p-limit from 2.2.2 to 2.3.0, @nextcloud/auth from 1.2.2 to 1.2.3, @babel/preset-env from 7.8.7 to 7.9.5, @nextcloud/event-bus from 1.1.3 to 1.1.4, @nextcloud/password-confirmation from 1.0.0 to 1.0.1, @nextcloud/l10n from 1.2.2 to 1.2.3, @nextcloud/initial-state from 1.1.1 to 1.1.2, core-js from 3.6.4 to 3.6.5 …
| * | Bump acceptance testsJohn Molakvoæ (skjnldsv)2020-04-101-4/+4
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #20422 from ↵Christoph Wurst2020-04-10278-756/+442
|\ \ | | | | | | | | | | | | nextcloud/techdebt/format-control-structs-classes-methods Format control structures, classes, methods and function
| * | Format control structures, classes, methods and functionChristoph Wurst2020-04-10278-756/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To continue this formatting madness, here's a tiny patch that adds unified formatting for control structures like if and loops as well as classes, their methods and anonymous functions. This basically forces the constructs to start on the same line. This is not exactly what PSR2 wants, but I think we can have a few exceptions with "our" style. The starting of braces on the same line is pracrically standard for our code. This also removes and empty lines from method/function bodies at the beginning and end. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #19495 from nextcloud/preview-generate-batchRoeland Jago Douma2020-04-101-14/+23
|\ \ \ | |/ / |/| | optimize batch generation of previews
| * | fix preview generation testsRobin Appelman2020-04-101-14/+23
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Use elseif instead of else ifChristoph Wurst2020-04-1020-60/+60
| |/ |/| | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Remove space between switch case and colonChristoph Wurst2020-04-091-32/+32
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Remove trailing whitespaces from commentsChristoph Wurst2020-04-094-6/+6
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Remove trailing and in between spacesChristoph Wurst2020-04-0913-28/+28
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Unify function spacing to PSR2 recommendationChristoph Wurst2020-04-0991-363/+359
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Use a blank line after the opening tagChristoph Wurst2020-04-0942-12/+66
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Use exactly one empty line after the namespace declarationChristoph Wurst2020-04-0983-68/+15
| | | | | | | | | | | | For PSR2 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Fix (array) indent style to always use one tabChristoph Wurst2020-04-0934-1832/+1832
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #16035 from nextcloud/share-search-hide-on-matchblizzz2020-04-091-62/+77
|\ \ | | | | | | dont show remote and email options if we have an exact match for local user email
| * | dont show remote and email options if we have an exact match for local user ↵Robin Appelman2020-04-081-62/+77
| |/ | | | | | | | | | | email Signed-off-by: Robin Appelman <robin@icewind.nl>