wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
38458 commits 157 branches 562 tags 714 MiB
Commit graph

38458 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
1c2cdc9d3a Merge pull request #4444 from nextcloud/remove-unused-variables 
Remove unused variables
 2017-04-24 08:09:01 +02:00
Nextcloud bot
a01f946c56
[tx-robot] updated from transifex 2017-04-24 00:07:28 +00:00
Nextcloud bot
11c7953888
[tx-robot] updated from transifex 2017-04-23 00:07:31 +00:00
Morris Jobke
2b6f6dac00
Remove unused variables 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-22 18:20:51 -05:00
Lukas Reschke
1bd3bd33f9 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
 2017-04-22 11:17:54 +02:00
Lukas Reschke
7acdc2a096 Merge pull request #4432 from nextcloud/fix-grammar 
Fix grammar
 2017-04-22 08:15:46 +02:00
Lukas Reschke
d0d34d308a
Add at most 10 password reset requests per 5 minutes and IP range 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-22 08:12:54 +02:00
Nextcloud bot
363d1c69dd
[tx-robot] updated from transifex 2017-04-22 00:07:36 +00:00
Morris Jobke
17c7b64f04 Merge pull request #4431 from nextcloud/acceptance-macos 
Run acceptance tests on macOS
 2017-04-21 16:09:50 -05:00
Morris Jobke
aa2bed44b6
Fix grammar 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-21 16:07:12 -05:00
Morris Jobke
db7eedccc9
Run acceptance tests on macOS 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-21 14:11:56 -05:00
Roeland Jago Douma
eaa6f766e6 Merge pull request #4208 from danxuliu/add-basic-acceptance-test-system 
Add basic acceptance test system
 2017-04-21 20:53:32 +02:00
Roeland Jago Douma
867b3ee234 Merge pull request #4396 from nextcloud/scan-non-existing 
show error when trying to scan non existing path
 2017-04-21 19:47:33 +02:00
Roeland Jago Douma
d46b155916 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
 2017-04-21 19:43:53 +02:00
Morris Jobke
1666a17ebe Merge pull request #4426 from nextcloud/update-dom-purify 
Bump to DOMPurify 0.8.6
 2017-04-21 12:41:26 -05:00
Lukas Reschke
83ecf893d9 Merge pull request #4429 from nextcloud/proper-return-code-for-welcome-email 
Use RESPOND_NOT_FOUND for non existing user
 2017-04-21 19:39:40 +02:00
Morris Jobke
4dd72e9eb9
Use RESPOND_NOT_FOUND for non existing user 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-21 11:30:00 -05:00
Robin Appelman
6fbe991afb
limit the user when searching for a file by id if we know the user already 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-21 17:11:26 +02:00
Roeland Jago Douma
b101c6f5fe
Update core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-21 16:44:11 +02:00
Roeland Jago Douma
9a0280f1c8 Merge pull request #4422 from nextcloud/favorite-wording-detail 
Wording detail fix for favorite emptycontent view
 2017-04-21 16:43:22 +02:00
Morris Jobke
5605166523 Merge pull request #4423 from nextcloud/reload-fav-view 
properly reload favorites list
 2017-04-21 09:35:34 -05:00
Lukas Reschke
f4755218a1
Bump to DOMPurify 0.8.6 
Fixes https://github.com/nextcloud/server/issues/4424

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-21 16:33:00 +02:00
Daniel Calviño Sánchez
e970b5261f 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>
 2017-04-21 14:47:44 +02:00
Daniel Calviño Sánchez
2f80025ec2 Move acceptance tests from build/acceptance to tests/acceptance 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-21 14:44:29 +02:00
Daniel Calviño Sánchez
f89c16f83e Exclude data-autotest from the files copied to the container 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-21 14:29:07 +02:00
Daniel Calviño Sánchez
cccbd028a6 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>
 2017-04-21 14:26:31 +02:00
Daniel Calviño Sánchez
42fbf809fe Remove no longer needed Docker helper and its related Dockerfile 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-21 14:26:30 +02:00
Daniel Calviño Sánchez
eea015c1ba Change default configuration to use local helper 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-21 14:26:30 +02:00
Daniel Calviño Sánchez
59004dc75e 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>
 2017-04-21 14:26:29 +02:00
Daniel Calviño Sánchez
bbe479bcd9 Generalize names and descriptions 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-21 14:24:37 +02:00
Daniel Calviño Sánchez
72310cdac1 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>
 2017-04-21 14:24:37 +02:00
Daniel Calviño Sánchez
593118204a 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>
 2017-04-21 14:24:32 +02:00
Robin Appelman
c49def4a10
properly reload favorites list 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-04-21 14:20:34 +02:00
Jan-Christoph Borchardt
8b8f537f3b Wording detail fix for favorite emptycontent view 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-21 14:11:49 +02:00
Roeland Jago Douma
3a2a87d25e Merge pull request #4418 from nextcloud/fix_3380 
No need to log guzzle exception
 2017-04-21 12:54:44 +02:00
Roeland Jago Douma
bec4b468c3
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>
 2017-04-21 11:29:01 +02:00
Roeland Jago Douma
e9b00f84b8 Merge pull request #4406 from nextcloud/fix-unit-test-problems 
Fix unit test problems
 2017-04-21 09:35:01 +02:00
Roeland Jago Douma
c4bd01456b Merge pull request #4408 from nextcloud/accesslist_ng 
Move systemtags and comments to new accesslist functions
 2017-04-21 08:58:52 +02:00
Nextcloud bot
fb7663cefe
[tx-robot] updated from transifex 2017-04-21 00:07:37 +00:00
Morris Jobke
f5b900b654 Merge pull request #4412 from individual-it/master 
deleted forgotten code in test
 2017-04-20 18:04:32 -05:00
Morris Jobke
9536cbf739 Merge pull request #4409 from nextcloud/socialharing_mail 
Allow social sharing to specify if a new window is opened
 2017-04-20 17:59:55 -05:00
Morris Jobke
8a743e0359 Merge pull request #4404 from Ardinis/master 
Remove json handling for files_external:config
 2017-04-20 17:59:35 -05:00
Morris Jobke
b99d2b78bd Merge pull request #3595 from nextcloud/dav-sharing-changes 
Restrict DAV share handling to the owner only
 2017-04-20 16:44:16 -05:00
Morris Jobke
5d18e4243d
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 16:01:26 -05:00
Artur Neumann
faf55adb90 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>
 2017-04-20 22:27:51 +05:45
Morris Jobke
6b41d82f4c Merge pull request #4411 from nextcloud/fix-it 
Remove accidentially commited module
 2017-04-20 10:53:03 -05:00
Morris Jobke
ec07791acc
Remove accidentially commited module 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 10:51:05 -05:00
Björn Schießle
810fb7ff2c Merge pull request #4402 from nextcloud/fix-clickable-area 
Fix clickable area in share permissions menu
 2017-04-20 16:49:00 +02:00
Björn Schießle
a4086a6ec5 Merge pull request #4303 from nextcloud/enforce-password-mailshare 
allow admin to enforce password on mail shares
 2017-04-20 16:46:36 +02:00
Morris Jobke
6c294c3407
fix typo 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-20 16:33:27 +02:00