summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1023 from GitHubUser4234/ldap_password_renew_prblizzz2017-04-2436-175/+974
|\ | | | | Handle password expiry in user_ldap
| * unit test adjustmentRoger Szabo2017-04-073-23/+35
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * lower case for attributesRoger Szabo2017-04-061-7/+7
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * blizzz comments 03.04.2017 with cachingRoger Szabo2017-04-061-2/+7
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * blizzz comments 03.04.2017Roger Szabo2017-04-065-22/+26
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * usertest adjustmentRoger Szabo2017-03-311-1/+1
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * usertest adjustmentRoger Szabo2017-03-311-11/+11
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * remove redundant tabsRoger Szabo2017-03-311-4/+4
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
| * restore ldap_password_renew_prRoger Szabo2017-03-3134-163/+941
| | | | | | | | Signed-off-by: Roger Szabo <roger.szabo@web.de>
* | Merge pull request #4443 from nextcloud/cleanup-unused-importsJoas Schilling2017-04-2496-164/+1
|\ \ | | | | | | Remove unused use statements
| * | Remove unused use statementsMorris Jobke2017-04-2296-164/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4434 from ↵Lukas Reschke2017-04-241-0/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/add-rate-limiting-to-solve-challenge-controller Add rate limit to TOTP solve challenge controller
| * | | Add rate limit to TOTP solve challenge controllerLukas Reschke2017-04-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/2626 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #4401 from nextcloud/caldav-carddav-nc-owner-displaynameRoeland Jago Douma2017-04-246-12/+77
|\ \ \ \ | | | | | | | | | | add owner-displayname property to calendars and addressbooks
| * | | | add owner-displayname property to calendars and addressbooksGeorg Ehrke2017-04-236-12/+77
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #4444 from nextcloud/remove-unused-variablesRoeland Jago Douma2017-04-242-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused variables
| * | | | | Remove unused variablesMorris Jobke2017-04-222-2/+0
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-2436-4/+108
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-04-2362-236/+730
| | | |
* | | | Merge pull request #4435 from ↵Lukas Reschke2017-04-222-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/allow-at-maximum-10-reset-mails-requests-per-5-minutes Add at most 10 password reset requests per 5 minutes and IP range
| * | | | Add at most 10 password reset requests per 5 minutes and IP rangeLukas Reschke2017-04-222-1/+4
| | |/ / | |/| | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | Merge pull request #4432 from nextcloud/fix-grammarLukas Reschke2017-04-221-4/+4
|\ \ \ \ | |/ / / |/| | | Fix grammar
| * | | Fix grammarMorris Jobke2017-04-211-4/+4
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-04-2290-142/+418
| | |
* | | Merge pull request #4431 from nextcloud/acceptance-macosMorris Jobke2017-04-211-4/+30
|\ \ \ | |/ / |/| | Run acceptance tests on macOS
| * | Run acceptance tests on macOSMorris Jobke2017-04-211-4/+30
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4208 from danxuliu/add-basic-acceptance-test-systemRoeland Jago Douma2017-04-2124-0/+2135
|\ \ | | | | | | Add basic acceptance test system
| * | Make test passwords valid for the password_policy appDaniel Calviño Sánchez2017-04-213-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Move acceptance tests from build/acceptance to tests/acceptanceDaniel Calviño Sánchez2017-04-2124-6/+7
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Exclude data-autotest from the files copied to the containerDaniel Calviño Sánchez2017-04-211-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add safety parameterDaniel Calviño Sánchez2017-04-213-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Remove no longer needed Docker helper and its related DockerfileDaniel Calviño Sánchez2017-04-212-278/+0
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Change default configuration to use local helperDaniel Calviño Sánchez2017-04-212-29/+8
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Run acceptance tests using the local helper instead of the Docker oneDaniel Calviño Sánchez2017-04-211-126/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Generalize names and descriptionsDaniel Calviño Sánchez2017-04-213-14/+14
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Use PHP built-in web server instead of Apache in DroneDaniel Calviño Sánchez2017-04-213-230/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Replace downloaded Selenium server with Docker containerDaniel Calviño Sánchez2017-04-213-97/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Make possible to specify a subset of the acceptance tests to runDaniel Calviño Sánchez2017-04-191-2/+5
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add acceptance test steps to DroneDaniel Calviño Sánchez2017-04-192-0/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each acceptance test feature is run in its own Drone step. The container of the step runs the acceptance tests themselves, but they require two additional Drone services. One service provides the Selenium server that performs the web browser actions specified by the tests, and the other service provides the Nextcloud server that the tests will be run against (due to security concerns the acceptance tests themselves can not create Docker containers for the Nextcloud server as done when running them in a local system, as if Drone containers had access to Docker a malicious pull request could be used to take over the Drone server). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add general multiplier for find timeoutsDaniel Calviño Sánchez2017-04-192-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the timeouts specified in the acceptance tests are enough in most cases they may not be when running them in a slow system or environment. For those situations a general multiplier for find timeouts is added. It can be set in the "behat.yml" configuration file to increase the timeout used in every find call (except those that used a timeout of 0, as in those cases the element had to be already present when finding it and whether the system is slow or not does not change that). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add the timeout in NoSuchElementException messagesDaniel Calviño Sánchez2017-04-191-1/+8
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add NextcloudTestServerHelper for Nextcloud servers in Drone servicesDaniel Calviño Sánchez2017-04-191-0/+272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to security concerns, the public Nextcloud server repository is not set as "trusted" in Drone (otherwise a malicious pull request could be used to take over the server), so it is not possible to create Docker containers from the containers started by Drone. Therefore, the Nextcloud server must be started as a service by Drone itself. The NextcloudTestServerDroneHelper is added to manage from the acceptance tests a Nextcloud test server running in a Drone service; to be able to control the remote Nextcloud server the Drone service must provide the Nextcloud server control server. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Extract waiting for the server to start to the Utils classDaniel Calviño Sánchez2017-04-192-21/+32
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Extract installation and configuration of the Nextcloud serverDaniel Calviño Sánchez2017-04-192-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | The installation and configuration of the Nextcloud server as expected by the acceptance tests is extracted to its own script so it can be used from any element that launches the acceptance tests. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Use NextcloudTestServerHelper in NextcloudTestServerContextDaniel Calviño Sánchez2017-04-191-31/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of depending on a Nextcloud test server created through Docker, NextcloudTestServerContext now uses the NextcloudTestServerHelper interface. This makes possible to provide other implementations of the interface for those cases in which using a Docker container is not a valid approach, like in the continuous integration system of the public repository due to security concerns. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Extract NextcloudTestServerHelper interfaceDaniel Calviño Sánchez2017-04-192-11/+85
| | | | | | | | | | | | | | | | | | | | | The NextcloudTestServerHelper interface provides the needed methods to manage the Nextcloud server used in acceptance tests. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Reorganize method position inside classDaniel Calviño Sánchez2017-04-191-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | For consistency with the rest of private methods in the class, "isContainerRegistered" is moved below the only public method in which it is used ("cleanUp"). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Hide methods not needed outside the classDaniel Calviño Sánchez2017-04-191-4/+4
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove no longer needed methodsDaniel Calviño Sánchez2017-04-191-28/+0
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Move all Docker-related logic to NextcloudTestServerDockerHelperDaniel Calviño Sánchez2017-04-192-40/+79
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 15:53:07 +0000