]>
source.dussan.org Git - nextcloud-server.git/log
Daniel Calviño Sánchez [Sun, 23 Apr 2017 17:47:28 +0000 (19:47 +0200)]
Extract updateSharePasswordIfNeeded function
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Sun, 23 Apr 2017 17:32:15 +0000 (19:32 +0200)]
Join if block to preceding if chain
If getShareType() returns "email" it can not also return "user", "group"
nor "link", so the if block can be added to the preceding if chain.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Sun, 23 Apr 2017 17:11:06 +0000 (19:11 +0200)]
Add missing unit test for updateShare with email share
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Sun, 23 Apr 2017 17:10:00 +0000 (19:10 +0200)]
Add missing hook check
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Sun, 23 Apr 2017 17:04:06 +0000 (19:04 +0200)]
Fix double hashing of shared link passwords
The plain text password for a shared links was hashed and, then, the
hashed password was hashed again and set as the final password. Due to
this the password introduced in the "Authenticate" page for the shared
link was always a wrong password, and thus the file could not be
accessed.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Sun, 23 Apr 2017 16:54:33 +0000 (18:54 +0200)]
Fix working icon not hidden when successfully setting a password
When a request to set the password of a shared link is sent a working
icon is shown. However, as there was no "success" callback, the icon was
never hidden again after successfully setting the password (it worked
fine if there was an error, though).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Sat, 22 Apr 2017 16:20:32 +0000 (18:20 +0200)]
Add acceptance tests for sharing password protected links
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Sun, 23 Apr 2017 16:40:58 +0000 (18:40 +0200)]
Add system to share data between acceptance test steps
The data storage (the "notebook") is shared between all the actors, so
the data can be stored and retrieved between different steps by any
actor in the same scenario.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Lukas Reschke [Mon, 24 Apr 2017 08:03:19 +0000 (10:03 +0200)]
Merge pull request #4434 from nextcloud/add-rate-limiting-to-solve-challenge-controller
Add rate limit to TOTP solve challenge controller
Roeland Jago Douma [Mon, 24 Apr 2017 07:17:55 +0000 (09:17 +0200)]
Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displayname
add owner-displayname property to calendars and addressbooks
Roeland Jago Douma [Mon, 24 Apr 2017 06:09:01 +0000 (08:09 +0200)]
Merge pull request #4444 from nextcloud/remove-unused-variables
Remove unused variables
Nextcloud bot [Mon, 24 Apr 2017 00:07:28 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Georg Ehrke [Wed, 19 Apr 2017 14:18:44 +0000 (16:18 +0200)]
add owner-displayname property to calendars and addressbooks
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Nextcloud bot [Sun, 23 Apr 2017 00:07:31 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Sat, 22 Apr 2017 23:20:51 +0000 (18:20 -0500)]
Remove unused variables
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Lukas Reschke [Sat, 22 Apr 2017 09:17:54 +0000 (11:17 +0200)]
Merge pull request #4435 from nextcloud/allow-at-maximum-10-reset-mails-requests-per-5-minutes
Add at most 10 password reset requests per 5 minutes and IP range
Lukas Reschke [Sat, 22 Apr 2017 06:15:46 +0000 (08:15 +0200)]
Merge pull request #4432 from nextcloud/fix-grammar
Fix grammar
Lukas Reschke [Sat, 22 Apr 2017 06:12:54 +0000 (08:12 +0200)]
Add at most 10 password reset requests per 5 minutes and IP range
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Lukas Reschke [Sat, 22 Apr 2017 05:59:40 +0000 (07:59 +0200)]
Add rate limit to TOTP solve challenge controller
Fixes https://github.com/nextcloud/server/issues/2626
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Nextcloud bot [Sat, 22 Apr 2017 00:07:36 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Fri, 21 Apr 2017 21:09:50 +0000 (16:09 -0500)]
Merge pull request #4431 from nextcloud/acceptance-macos
Run acceptance tests on macOS
Morris Jobke [Fri, 21 Apr 2017 21:07:12 +0000 (16:07 -0500)]
Fix grammar
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Fri, 21 Apr 2017 19:11:56 +0000 (14:11 -0500)]
Run acceptance tests on macOS
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Fri, 21 Apr 2017 18:53:32 +0000 (20:53 +0200)]
Merge pull request #4208 from danxuliu/add-basic-acceptance-test-system
Add basic acceptance test system
Roeland Jago Douma [Fri, 21 Apr 2017 17:47:33 +0000 (19:47 +0200)]
Merge pull request #4396 from nextcloud/scan-non-existing
show error when trying to scan non existing path
Roeland Jago Douma [Fri, 21 Apr 2017 17:43:53 +0000 (19:43 +0200)]
Merge pull request #4428 from nextcloud/file-by-id-limit-user
limit the user when searching for a file by id if we know the user already
Morris Jobke [Fri, 21 Apr 2017 17:41:26 +0000 (12:41 -0500)]
Merge pull request #4426 from nextcloud/update-dom-purify
Bump to DOMPurify 0.8.6
Lukas Reschke [Fri, 21 Apr 2017 17:39:40 +0000 (19:39 +0200)]
Merge pull request #4429 from nextcloud/proper-return-code-for-welcome-email
Use RESPOND_NOT_FOUND for non existing user
Morris Jobke [Fri, 21 Apr 2017 16:30:00 +0000 (11:30 -0500)]
Use RESPOND_NOT_FOUND for non existing user
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Robin Appelman [Fri, 21 Apr 2017 15:11:26 +0000 (17:11 +0200)]
limit the user when searching for a file by id if we know the user already
Signed-off-by: Robin Appelman <robin@icewind.nl>
Roeland Jago Douma [Fri, 21 Apr 2017 14:44:11 +0000 (16:44 +0200)]
Update core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 21 Apr 2017 14:43:22 +0000 (16:43 +0200)]
Merge pull request #4422 from nextcloud/favorite-wording-detail
Wording detail fix for favorite emptycontent view
Morris Jobke [Fri, 21 Apr 2017 14:35:34 +0000 (09:35 -0500)]
Merge pull request #4423 from nextcloud/reload-fav-view
properly reload favorites list
Lukas Reschke [Fri, 21 Apr 2017 14:33:00 +0000 (16:33 +0200)]
Bump to DOMPurify 0.8.6
Fixes https://github.com/nextcloud/server/issues/4424
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Daniel Calviño Sánchez [Fri, 21 Apr 2017 12:47:44 +0000 (14:47 +0200)]
Make test passwords valid for the password_policy app
As requested by Morris Jobke, the passwords in the acceptance tests were
modified to make them valid both for a clean Nextcloud server and one
with the password_policy app enabled.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Fri, 21 Apr 2017 12:35:19 +0000 (14:35 +0200)]
Move acceptance tests from build/acceptance to tests/acceptance
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Fri, 21 Apr 2017 12:29:07 +0000 (14:29 +0200)]
Exclude data-autotest from the files copied to the container
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Wed, 19 Apr 2017 06:15:51 +0000 (08:15 +0200)]
Add safety parameter
As the script modifies the Git repository a safety parameter was added
to prevent running it by mistake and messing with the local copy of the
repository.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Wed, 19 Apr 2017 06:06:32 +0000 (08:06 +0200)]
Remove no longer needed Docker helper and its related Dockerfile
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Wed, 19 Apr 2017 06:05:40 +0000 (08:05 +0200)]
Change default configuration to use local helper
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Wed, 19 Apr 2017 05:59:25 +0000 (07:59 +0200)]
Run acceptance tests using the local helper instead of the Docker one
When run through "run.sh" the acceptance tests were executed in the same
system in which the script was called and they started and stopped the
Nextcloud server using Docker containers that provided real web servers.
For consistency now they use the same approach used when run through
Drone: the acceptance tests are run in a Docker container and they start
and stop the Nextcloud server directly using the PHP built-in web server.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Wed, 19 Apr 2017 05:58:18 +0000 (07:58 +0200)]
Generalize names and descriptions
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Tue, 18 Apr 2017 18:24:46 +0000 (20:24 +0200)]
Use PHP built-in web server instead of Apache in Drone
Instead of running an additional Drone service with the Nextcloud server
now the Nextcloud server is run in the same Drone step as the acceptance
tests themselves using the PHP built-in web server.
Thanks to this, the Nextcloud server control is no longer needed, as the
acceptance tests can now directly reset, start and stop the Nextcloud
server. Also, the "nextcloudci/php7.0:php7.0-7" image provides
everything needed to run and manage the Nextcloud server (including the
Git command used to restore the directory to a saved state), so the
custom image is no longer needed either.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Daniel Calviño Sánchez [Sun, 16 Apr 2017 18:31:52 +0000 (20:31 +0200)]
Replace downloaded Selenium server with Docker container
Instead of downloading the Selenium server and requiring a specific
Firefox version to be installed in the system now the Selenium server is
run using one of the official Selenium Docker images, which provides
both the Selenium server and the appropriate version of Firefox.
Moreover, as it is run inside the Docker container, the web browser is
now run in headless mode; however, if needed, it can still be viewed
through VNC.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Robin Appelman [Fri, 21 Apr 2017 12:20:34 +0000 (14:20 +0200)]
properly reload favorites list
Signed-off-by: Robin Appelman <robin@icewind.nl>
Jan-Christoph Borchardt [Fri, 21 Apr 2017 12:11:49 +0000 (14:11 +0200)]
Wording detail fix for favorite emptycontent view
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Roeland Jago Douma [Fri, 21 Apr 2017 10:54:44 +0000 (12:54 +0200)]
Merge pull request #4418 from nextcloud/fix_3380
No need to log guzzle exception
Roeland Jago Douma [Fri, 21 Apr 2017 09:29:01 +0000 (11:29 +0200)]
No need to log guzzle exception
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>
Roeland Jago Douma [Fri, 21 Apr 2017 07:35:01 +0000 (09:35 +0200)]
Merge pull request #4406 from nextcloud/fix-unit-test-problems
Fix unit test problems
Roeland Jago Douma [Fri, 21 Apr 2017 06:58:52 +0000 (08:58 +0200)]
Merge pull request #4408 from nextcloud/accesslist_ng
Move systemtags and comments to new accesslist functions
Nextcloud bot [Fri, 21 Apr 2017 00:07:37 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 20 Apr 2017 23:04:32 +0000 (18:04 -0500)]
Merge pull request #4412 from individual-it/master
deleted forgotten code in test
Morris Jobke [Thu, 20 Apr 2017 22:59:55 +0000 (17:59 -0500)]
Merge pull request #4409 from nextcloud/socialharing_mail
Allow social sharing to specify if a new window is opened
Morris Jobke [Thu, 20 Apr 2017 22:59:35 +0000 (17:59 -0500)]
Merge pull request #4404 from Ardinis/master
Remove json handling for files_external:config
Morris Jobke [Thu, 20 Apr 2017 21:44:16 +0000 (16:44 -0500)]
Merge pull request #3595 from nextcloud/dav-sharing-changes
Restrict DAV share handling to the owner only
Morris Jobke [Thu, 20 Apr 2017 21:01:26 +0000 (16:01 -0500)]
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Artur Neumann [Thu, 20 Apr 2017 16:35:17 +0000 (22:20 +0545)]
deleted forgotten code in test
how embarrassing, left code from before I've done the loop around the test
Signed-off-by: Artur Neumann <info@individual-it.net>
Morris Jobke [Thu, 20 Apr 2017 15:53:03 +0000 (10:53 -0500)]
Merge pull request #4411 from nextcloud/fix-it
Remove accidentially commited module
Morris Jobke [Thu, 20 Apr 2017 15:51:05 +0000 (10:51 -0500)]
Remove accidentially commited module
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Björn Schießle [Thu, 20 Apr 2017 14:49:00 +0000 (16:49 +0200)]
Merge pull request #4402 from nextcloud/fix-clickable-area
Fix clickable area in share permissions menu
Björn Schießle [Thu, 20 Apr 2017 14:46:36 +0000 (16:46 +0200)]
Merge pull request #4303 from nextcloud/enforce-password-mailshare
allow admin to enforce password on mail shares
Morris Jobke [Wed, 19 Apr 2017 23:06:40 +0000 (18:06 -0500)]
fix typo
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 19 Apr 2017 22:54:17 +0000 (17:54 -0500)]
Fix casing
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Bjoern Schiessle [Wed, 19 Apr 2017 15:08:52 +0000 (17:08 +0200)]
fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Wed, 19 Apr 2017 14:56:34 +0000 (16:56 +0200)]
respect password policy for auto generated passwords
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Wed, 19 Apr 2017 13:53:33 +0000 (15:53 +0200)]
improve mail text
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Wed, 19 Apr 2017 13:10:22 +0000 (15:10 +0200)]
create activity if a password was send by mail
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Tue, 11 Apr 2017 19:29:54 +0000 (21:29 +0200)]
allow to set a password for shares which where created without a password before the admin started to enforce the password
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Bjoern Schiessle [Thu, 13 Apr 2017 09:32:59 +0000 (11:32 +0200)]
templates no longer needed
Bjoern Schiessle [Mon, 10 Apr 2017 16:36:23 +0000 (18:36 +0200)]
allow admin to enforce password on mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Roeland Jago Douma [Thu, 20 Apr 2017 14:32:46 +0000 (16:32 +0200)]
Allow social sharing to specify if a new window is opened
For example mail shares should not open a new window because it looks
weird.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Thu, 20 Apr 2017 12:34:28 +0000 (14:34 +0200)]
Move systemtags and comments to new accesslist functions
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Joas Schilling [Thu, 20 Apr 2017 11:54:20 +0000 (13:54 +0200)]
Fix invalid Dav test
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>
Joas Schilling [Thu, 20 Apr 2017 11:48:14 +0000 (13:48 +0200)]
Make sure we use a new encryption module all the time
Signed-off-by: Joas Schilling <coding@schilljs.com>
Robin Appelman [Thu, 20 Apr 2017 11:25:49 +0000 (13:25 +0200)]
check for existence before we start the db transaction
Signed-off-by: Robin Appelman <robin@icewind.nl>
Joas Schilling [Thu, 20 Apr 2017 11:17:21 +0000 (13:17 +0200)]
Don't assume the admin didn't configure Opcache correctly...
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 20 Apr 2017 11:10:34 +0000 (13:10 +0200)]
Fix theming tests
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>
Joas Schilling [Thu, 20 Apr 2017 10:55:11 +0000 (12:55 +0200)]
Use the correct class
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 20 Apr 2017 10:54:14 +0000 (12:54 +0200)]
Import some classes
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 20 Apr 2017 10:48:51 +0000 (12:48 +0200)]
Use the correct Dummy and Backend class
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 20 Apr 2017 10:41:42 +0000 (12:41 +0200)]
Kill dead code
> No tests found in class "Test\Share\MailNotificationsTest".
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 20 Apr 2017 10:37:59 +0000 (12:37 +0200)]
Fix warning with undefined method
Trying to configure method "getRemember" 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>
Joas Schilling [Thu, 20 Apr 2017 10:27:32 +0000 (12:27 +0200)]
Don't use deprecated getMock() anymore
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 20 Apr 2017 10:23:34 +0000 (12:23 +0200)]
Restoring the error handler within the error handler causes unexpected results
See http://php.net/manual/en/function.restore-error-handler.php#120879
for more information.
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 20 Apr 2017 10:23:12 +0000 (12:23 +0200)]
Delete the correct config value
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 20 Apr 2017 10:21:39 +0000 (12:21 +0200)]
Only loop over Test cases
Signed-off-by: Joas Schilling <coding@schilljs.com>
Ardinis [Thu, 20 Apr 2017 09:31:04 +0000 (11:31 +0200)]
reviewed
Joas Schilling [Thu, 20 Apr 2017 09:03:22 +0000 (11:03 +0200)]
Merge pull request #4398 from nextcloud/fix_accesslistcode
Get proper accesslist for userFolder
Joas Schilling [Thu, 20 Apr 2017 08:50:56 +0000 (10:50 +0200)]
Merge pull request #4212 from individual-it/master
validate file name before uploading in upload only folder
Joas Schilling [Thu, 23 Feb 2017 09:37:49 +0000 (10:37 +0100)]
Fix remaining "PHP Inspection" warnings
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 23 Feb 2017 09:33:54 +0000 (10:33 +0100)]
Add public access modifier to all methods
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Thu, 23 Feb 2017 09:31:28 +0000 (10:31 +0100)]
Restrict share handling to the owner only
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>
Roeland Jago Douma [Wed, 19 Apr 2017 13:11:54 +0000 (15:11 +0200)]
Get proper accesslist for userFolder
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>
Joas Schilling [Thu, 20 Apr 2017 08:25:16 +0000 (10:25 +0200)]
Merge pull request #4381 from nextcloud/2954_take_2
Fix group settings routes and fix route regression
Nextcloud bot [Thu, 20 Apr 2017 00:07:36 +0000 (00:07 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 19 Apr 2017 22:52:37 +0000 (17:52 -0500)]
Merge pull request #4384 from nextcloud/renderHtml-fix
Rename renderHTML to renderHtml
Morris Jobke [Wed, 19 Apr 2017 22:41:26 +0000 (17:41 -0500)]
Fix clickable area in share permissions menu
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 19 Apr 2017 22:04:16 +0000 (17:04 -0500)]
Add PHPDoc and handle exception in ScanAppData as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 18 Apr 2017 22:09:25 +0000 (17:09 -0500)]
Rename renderHTML to renderHtml
* fixes #4383
* improves consistency
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 19 Apr 2017 19:45:48 +0000 (14:45 -0500)]
Merge pull request #4387 from nextcloud/fix-little-glitch
Fix font-weight of settings button