summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-04-10214-546/+578
|
* Merge pull request #9127 from ↵Morris Jobke2018-04-096-23/+168
|\ | | | | | | | | nextcloud/make-possible-to-run-acceptance-tests-on-apache Make possible to run acceptance tests on Apache
| * Rename helper for PHP built-in web serverDaniel Calviño Sánchez2018-04-092-14/+14
| | | | | | | | | | | | | | For consistency with the helper for the Apache web server the helper for the PHP built-in web server was renamed too. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Add helper to run acceptance tests on an Apache serverDaniel Calviño Sánchez2018-04-091-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default and only helper to run acceptance tests run them on the PHP built-in web server. This commit introduces a new helper that can be used to run them on an Apache web server instead. This helper is meant to be used by the acceptance tests of apps that require a multi-threaded web server to run (like Talk, due to its use of long polling). To use the helper it is only needed to set it in the Behat configuration for the acceptance tests of the app, as explained in the "NextcloudTestServerContext" documentation. It is assumed that the acceptance tests are run using the default setup, and therefore inside a Docker container based on the image for acceptance tests from Nextcloud. Due to that the helper is expected to have root permissions, and thus it starts and stops the Apache web server directly using "service start/stop apache2". In the same way it also restores the owner and group for "apps", "config" and "data" to "www-data", as it is the user that Apache sub-processes are run as. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Add support for setting the domain also when a specific helper is usedDaniel Calviño Sánchez2018-04-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, the domain was automatically added assuming that the NextcloudTestServerContext had no parameters defined in the Behat configuration. However, in order to use a helper for Apache it would need to be specified in the configuration with something like: - NextcloudTestServerContext: nextcloudTestServerHelper: NextcloudTestServerLocalApacheHelper The substitution now works both when a helper is specified and when it is not; note, however, that providing custom parameters to the helper is not supported, although they are not needed anyway so it is not really a problem. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Install and configure Nextcloud server as www-dataDaniel Calviño Sánchez2018-04-091-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Apache sub-processes are run as the www-data user, and they need to be able to write to the "apps", "config" and "data" directories, so they have to belong to that user, and therefore the Nextcloud server has to be installed and configured too as the www-data user. The PHP built-in web server will still be run as the root user, but in that case the owner of those directories makes no difference, so this is compatible with both cases. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Use Docker image for acceptance testsDaniel Calviño Sánchez2018-04-092-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | The Docker image for acceptance tests provides support for both the PHP built-in web server and the Apache web server; the acceptance tests for the server are run on the PHP built-in web server, but the acceptance tests for some apps will have to be run on the Apache web server (for example, Talk, as it uses long polling), so a Docker image to support both cases has to be used in "run.sh". ".drone.yml" was just updated for consistency, although it was not really needed. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #9111 from nextcloud/use-proper-bool-user-disabled-stateMorris Jobke2018-04-095-8/+7
|\ \ | | | | | | Return proper boolean and do not save enabled state in db
| * | Fixed testsJohn Molakvoæ (skjnldsv)2018-04-092-3/+3
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Properly return boolean on enable stateJohn Molakvoæ (skjnldsv)2018-04-093-5/+4
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #7972 from nextcloud/fix_7782Morris Jobke2018-04-097-12/+570
|\ \ \ | | | | | | | | Use zip32 if possible
| * | | Do not run download scenarios tagged as "large" in DroneDaniel Calviño Sánchez2018-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Large scenarios take too long to run, so they would be cancelled before they were finished. Therefore, now they are not even run. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Make possible to provide "--tags=XXX" parameter to BehatDaniel Calviño Sánchez2018-04-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | "--tags=XXX" limits the features or scenarios to be run to those matching the tag filter expression. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add integration tests for zip32/zip64 boundaries of number of filesDaniel Calviño Sánchez2018-04-062-0/+162
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add integration tests for downloading basic zip filesDaniel Calviño Sánchez2018-04-064-0/+298
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Fix use of data directory in integration testsDaniel Calviño Sánchez2018-04-061-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The data directory is not necessarily located at "../..". The proper directory is now got by running "php console.php config:system:get datadirectory". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Use zip32 only if there are less than 65536 filesDaniel Calviño Sánchez2018-04-062-8/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A zip32 file can contain, at most, 65535 files (and folders), so take that constraint into account. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Use zip32 if possibleRoeland Jago Douma2018-04-062-9/+31
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | * OSX doesn't handle 64zip that well * Some other implentations don't handle it perfectly either * If the file is belog 4GiB (some overhead) => zip32 * This covers the 99% case I bet Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #9108 from nextcloud/ocs-api-subadmins-quota-adduserMorris Jobke2018-04-091-43/+77
|\ \ \ | |_|/ |/| | Allow user creation with subadmins and quota
| * | Allow user creation with subadmins and quotaJohn Molakvoæ (skjnldsv)2018-04-061-43/+77
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #9114 from ↵Morris Jobke2018-04-094-11/+57
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/make-possible-to-provide-acceptance-tests-for-apps Make possible to provide acceptance tests for apps
| * | | Make possible to set the acceptance tests directory to useDaniel Calviño Sánchez2018-04-062-7/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the acceptance tests were run they were always loaded from the "tests/acceptance" directory of the Nextcloud server. Now it is possible to set the directory used to look for the Behat configuration and the Nextcloud installation script, which makes possible to run acceptance tests for the apps too instead of only for the server (although if no directory is explicitly given the tests for the server are the ones run). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add context classes to Composer autoloadDaniel Calviño Sánchez2018-04-062-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to autoload the server context classes the "bootstrap" directory was explicitly listed in Behat autoload configuration. This is fine in the configuration of acceptance tests for the server, but it would force the configuration of acceptance tests for the apps to explicitly include the path for the server context classes to be able to use them (for example, for the login step). Besides with its own configuration Behat also supports autoloading classes using Composer, so now context classes are autoloaded using Composer instead; thanks to this the server context classes are autoloaded also in the acceptance tests for apps without any explicit configuration in them. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Fix typoDaniel Calviño Sánchez2018-03-271-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #9116 from nextcloud/rakekniven-patch-1Roeland Jago Douma2018-04-091-1/+1
|\ \ \ \ | | | | | | | | | | Update settings.php
| * | | | Update settings.phprakekniven2018-04-091-1/+1
| | | | | | | | | | | | | | | Changed according to discussion.
| * | | | Update settings.phprakekniven2018-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Tiny l10n improvement. Reported at Transifex: https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/user_ldap/91002448
* | | | | Merge pull request #9090 from nextcloud/fix/noid/ldap-format-strict-paramMorris Jobke2018-04-091-17/+26
|\ \ \ \ \ | | | | | | | | | | | | parameter provided to L10N::n() could have been a string
| * | | | | parameter provided to L10N::n() could have been a stringArthur Schiwon2018-04-051-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #8777 from nextcloud/various-css-fixesRoeland Jago Douma2018-04-092-7/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Various css fixes
| * | | | | | Fixed inline confirm icon indexJohn Molakvoæ (skjnldsv)2018-03-212-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bullet/icon combination visibility Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #9115 from nextcloud/feature/noid/login_flow_wordingRoeland Jago Douma2018-04-094-5/+90
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve login flow
| * | | | | | | Improve login flowRoeland Jago Douma2018-04-084-5/+90
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add page explaining you are about to grant access * Show grant access page after login Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #9118 from nextcloud/video-switchRoeland Jago Douma2018-04-092-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add video switch icon
| * | | | | | | Add video switch iconJan-Christoph Borchardt2018-04-072-0/+5
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-04-094-8/+90
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-04-0814-22/+110
|/ / / / / /
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-04-07140-176/+208
| | | | | |
* | | | | | Merge pull request #9109 from nextcloud/feature/8004/always_rememberRoeland Jago Douma2018-04-063-33/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Always remember me
| * | | | | Remove unused parameterRoeland Jago Douma2018-04-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix testsRoeland Jago Douma2018-04-062-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Always remember meRoeland Jago Douma2018-04-062-13/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8004 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #9076 from nextcloud/feature/7573/user_db_backend_indexRoeland Jago Douma2018-04-065-25/+148
|\ \ \ \ \ | | | | | | | | | | | | Make select queries on user DB backend indexable
| * | | | | Bump autoloaderRoeland Jago Douma2018-04-063-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Silence phanRoeland Jago Douma2018-04-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Use the uid_lower columnRoeland Jago Douma2018-04-061-24/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can use a proper index Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Add an uid_lower column to the oc_users tableRoeland Jago Douma2018-04-062-1/+79
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new column. In the postSchemaChange copy over the values (with lower). This should work just fine as this is a very simple operation. Even if you have 1M users in the db backend this should be fast enough. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #9101 from nextcloud/3rdparty/switch_zipstreamerRoeland Jago Douma2018-04-061-0/+0
|\ \ \ \ \ | | | | | | | | | | | | Switch ZipSteamer lib
| * | | | | Switch ZipSteamer libRoeland Jago Douma2018-04-061-0/+0
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #9084 from nextcloud/public-page-template-extendMorris Jobke2018-04-0617-87/+123
|\ \ \ \ \ | |/ / / / |/| | | | Public page template enhancements
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 14:38:43 +0000