aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #9665 from ↵Morris Jobke2018-05-292-4/+18
|\ | | | | | | | | nextcloud/add-workaround-for-parameter-not-available-in-mink-extension Add workaround for parameter not available in Mink Extension
| * Use "paths.base" parameter for the path to the custom Firefox profileDaniel Calviño Sánchez2018-05-291-1/+1
| | | | | | | | | | | | | | | | Although in the case of the acceptance tests for the server it is not strictly needed it was modified for consistency with the configuration used for the acceptance tests in apps. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Add workaround for parameter not available in Mink ExtensionDaniel Calviño Sánchez2018-05-291-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a bug in the Mink Extension for Behat it is not possible to use the "paths.base" parameter in the path to the custom Firefox profile. "paths.base" is a special parameter in the Behat configuration that refers to the directory in which "behat.yml" is stored. This comes in very handy to set the path to custom Firefox profiles in the acceptance tests for apps, as even if the "behat.yml" file belongs to an app its paths are relative to the directory in which the tests are run, that is, the "tests/acceptance" directory of the server. Until the bug is fixed, just before the acceptance tests are run the "paths.base" parameter in the path to the custom Firefox profile is replaced by its value in the "behat.yml" file used by the acceptance tests. Note that the file that is modified is the one inside the Docker container used to run the acceptance tests, so the original file is not touched. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Extract path to configuration dir to its own variableDaniel Calviño Sánchez2018-05-291-3/+5
|/ | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Merge pull request #9640 from nextcloud/fix/9502/missedstatecheckblizzz2018-05-292-8/+56
|\ | | | | check user state when fetching to avoid dealing with offline objects, fixes #9502
| * check user state when fetching to avoid dealing with offline objectsArthur Schiwon2018-05-292-8/+56
| | | | | | | | | | | | fixes #9502 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #9583 from nextcloud/files-home-userfolderMorris Jobke2018-05-292-7/+9
|\ \ | | | | | | use getUserFolder instead of getFileInfo when constructing FilesHome
| * | use getUserFolder instead of getFileInfo when constructing FilesHomeRobin Appelman2018-05-242-7/+9
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #9589 from nextcloud/bugfix/noid/allow-empty-route-navigationMorris Jobke2018-05-291-1/+1
|\ \ \ | | | | | | | | Allow empty route for navigation entries
| * | | Allow empty route for navigation entriesJulius Härtl2018-05-241-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Navigation entries might be handled by javascript, as the about section from https://github.com/nextcloud/firstrunwizard/pull/64 so we don't need a route for that. Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #9653 from nextcloud/bugfix/noid/oauth_basic_authRoeland Jago Douma2018-05-292-0/+89
|\ \ \ | | | | | | | | The OAuth endpoint needs to support Basic Auth
| * | | The OAuth endpoint needs to support Basic AuthRoeland Jago Douma2018-05-292-0/+89
|/ / / | | | | | | | | | | | | | | | * Add test Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | / [tx-robot] updated from transifexNextcloud bot2018-05-2932-8/+44
| |/ |/|
* | Merge pull request #9617 from nextcloud/users-sort-case-fixMorris Jobke2018-05-282-4/+6
|\ \ | | | | | | Ignore case when sorting users
| * | Added case example to testsJohn Molakvoæ (skjnldsv)2018-05-261-2/+4
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Ignore case when sorting usersJohn Molakvoæ (skjnldsv)2018-05-261-2/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #9559 from nextcloud/sabre-head-dont-open-fileMorris Jobke2018-05-281-0/+0
|\ \ \ | | | | | | | | dont open the file on dav HEAD request
| * | | dont open the file on dav HEAD requestRobin Appelman2018-05-261-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #9268 from nextcloud/bugfix/6711Morris Jobke2018-05-2814-31/+242
|\ \ \ \ | | | | | | | | | | Do not load calendar/addressbook plugins if not needed
| * | | | Move repairstep to a custom commandRoeland Jago Douma2018-05-286-39/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People that have issues can run it manually Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix testsRoeland Jago Douma2018-05-272-2/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Adding repair step which cleans shares of invalid principalsRoeland Jago Douma2018-05-275-1/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/owncloud/core/pull/30149/commits/edacf22fbce4deefc181c53dd84c5fb278a9a28d Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | CalDAV and CardDAV plugins need to be registered for the principals ↵Roeland Jago Douma2018-05-272-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collection as well https://github.com/owncloud/core/pull/30149/commits/9f2e6431b88a9635b291b0e824abf74ba766616d Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | When sharing calendars and addressbooks the principal has to be verified to ↵Roeland Jago Douma2018-05-274-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be valid https://github.com/owncloud/core/pull/30149/commits/d3fb8fcdd3a6b00bde0c3c9eb4039876e7fc1967 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Do not load calendar/addressbook plugins if not neededRoeland Jago Douma2018-05-271-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6711 Based on https://github.com/owncloud/core/pull/30149/commits/f0fb21cf3563088284c56be4eac48c7d9725cb21 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #9584 from nextcloud/file-cache-gc-isdirMorris Jobke2018-05-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | remove unneeded is_dir from file cache gc
| * | | | | remove unneeded is_dir from file cache gcRobin Appelman2018-05-241-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #9627 from nextcloud/limit-sinon-version-to-5.0.7-at-mostMorris Jobke2018-05-281-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Limit Sinon version to 5.0.7 at most
| * | | | | Limit Sinon version to 5.0.7 at mostDaniel Calviño Sánchez2018-05-281-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using fake servers with Sinon.JS, the JavaScript test framework, the XHR objects are also fake. In Sinon 5.0.8 the "setRequestHeader" of XMLHttpRequest was modified to normalize the header values (as requested by the spec), but since then only string values are accepted; null or integer values can no longer be passed to "setRequestHeader", as it expects the "replace" function to be available in the object. However, in the tests null and integer values are passed to "setRequestHeader", which causes them to fail. Both Firefox and Chromium accept passing non-string values to their "setRequestHeader" implementation, and it is done, for example, in davclient.js; it is not clear yet whether Sinon got too restrictive or the code calling "setRequestHeader" was too loose. Given that davclient.js is an external dependency, as a temporary measure Sinon version is forced to be 5.0.7 at most until either Sinon or davclient.js are updated. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | / / / [tx-robot] updated from transifexNextcloud bot2018-05-2826-0/+74
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-27114-188/+252
| | | |
* | | | Merge pull request #9585 from nextcloud/feature/noid/rename-syncclientsMorris Jobke2018-05-262-5/+5
|\ \ \ \ | |_|_|/ |/| | | Rename sync clients section to mobile & desktop
| * | | Fix Settings\ManagerTestJulius Härtl2018-05-251-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Rename sync clients section to mobile & desktopJulius Härtl2018-05-242-3/+3
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | / [tx-robot] updated from transifexNextcloud bot2018-05-2670-98/+214
| |/ |/|
* | Merge pull request #9488 from nextcloud/disabled-users-fixblizzz2018-05-2525-105/+370
|\ \ | | | | | | Added disabled count per groups & fixed disabled users query
| * | Do not show count on empty groupsJohn Molakvoæ (skjnldsv)2018-05-253-8/+21
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Tabs fixJohn Molakvoæ (skjnldsv)2018-05-251-1/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed app navigation orderJohn Molakvoæ (skjnldsv)2018-05-244-3/+5
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed error throw and disablign count group updateJohn Molakvoæ (skjnldsv)2018-05-245-20/+41
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix the navigation componentJohn Molakvoæ (skjnldsv)2018-05-244-10/+25
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Added total count for subadminsJohn Molakvoæ (skjnldsv)2018-05-247-14/+39
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Disabled fix since new users listJohn Molakvoæ (skjnldsv)2018-05-2414-61/+86
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixes since requirementJohn Molakvoæ (skjnldsv)2018-05-241-0/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed testsJohn Molakvoæ (skjnldsv)2018-05-242-2/+25
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Added disabled count per groupsJohn Molakvoæ (skjnldsv)2018-05-248-11/+151
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #9593 from nextcloud/fwdport/9586/masterMorris Jobke2018-05-259-23/+166
|\ \ \ | | | | | | | | add privacy link to theming and fix scrollbars
| * | | addjust footer height when legal links are present. fixes #9572Arthur Schiwon2018-05-243-3/+16
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | also add a privacy linkArthur Schiwon2018-05-248-21/+151
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-25236-408/+582
|/ / /
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 04:22:23 +0000