summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-05-0836-276/+380
|
* [tx-robot] updated from transifexNextcloud bot2017-05-0732-10/+238
|
* [tx-robot] updated from transifexNextcloud bot2017-05-0634-6/+154
|
* Merge pull request #4710 from nextcloud/skeleton-read-onlyRobin Appelman2017-05-051-2/+7
|\ | | | | handle permissions errors when copying the skeleton for a read only user
| * handle permissions errors when copying the skeleton for a read only userRobin Appelman2017-05-051-2/+7
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #4701 from nextcloud/enforce-typeRoeland Jago Douma2017-05-052-2/+6
|\ \ | | | | | | Enforce type hints in dav app
| * | Enforce type hints in dav appMorris Jobke2017-05-042-2/+6
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4703 from nextcloud/improve-memcache-testMorris Jobke2017-05-052-12/+44
|\ \ \ | |_|/ |/| | Make cache tests a bit more clear
| * | Make cache tests a bit more clearMorris Jobke2017-05-042-12/+44
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4707 from nextcloud/fix-invalid-theming-urlsRoeland Jago Douma2017-05-053-12/+25
|\ \ | | | | | | Fix invalid theming URLs
| * | Fix invalid theming URLsMorris Jobke2017-05-053-12/+25
|/ / | | | | | | | | | | | | * logo and background image had the cache buster applied twice: background-image: url(http://192.168.99.100/server/core/img/logo.svg?v=0?v=0); Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / [tx-robot] updated from transifexNextcloud bot2017-05-0580-146/+338
|/
* Merge pull request #4588 from nextcloud/update-redirection-login-flowRoeland Jago Douma2017-05-043-6/+7
|\ | | | | Update login flow redirection
| * Update login flow redirectionMario Danic2017-05-043-6/+7
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4700 from nextcloud/redis-cluster-compatibilityRoeland Jago Douma2017-05-041-2/+2
|\ \ | |/ |/| Compatibility with Redis and RedisCluster
| * Compatibility with Redis and RedisClusterMorris Jobke2017-05-041-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #4694 from nextcloud/fix_4676Christoph Wurst2017-05-041-0/+24
|\ \ | |/ |/| Load proper fonts in guest.css
| * Load proper fonts in guest.cssRoeland Jago Douma2017-05-041-0/+24
| | | | | | | | | | | | Fixes #4676 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #4681 from nextcloud/link_radioMorris Jobke2017-05-043-59/+68
|\ \ | | | | | | Make read/write options in sharing view radiobuttons
| * | Fix event firingRoeland Jago Douma2017-05-041-3/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Add radio class to read/write sharing options and 1px left adjustmentFelix A. Epp2017-05-042-3/+6
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | Fix read-only label idFelix A. Epp2017-05-041-1/+1
| | | | | | | | | | | | Signed-off-by: Felix A. Epp <work@felixepp.de>
| * | Make files drop more permanentRoeland Jago Douma2017-05-042-59/+65
| | | | | | | | | | | | | | | | | | Implement the suggestions from #2207 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4693 from nextcloud/fix_4644Roeland Jago Douma2017-05-042-1/+16
|\ \ \ | | | | | | | | Do not reload the filelist on first open
| * | | Do not reload the filelist on first openRoeland Jago Douma2017-05-042-1/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #4644 Without this patch the filelist would always reload. However since not all the correct data was set yet it would often: 1. fireoff a propfind to ../webdav/ 2. fireoff a propfind to ../webdav/<PATH> When just opening the file list those are the same so the result is just fine. However if opening a direct link it means that there is a race condition on which finishes first. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #4690 from nextcloud/fix-igroup-sinceMorris Jobke2017-05-041-1/+1
|\ \ \ | | | | | | | | Documentation fix IGroup::getDisplayName is available since version 12
| * | | IGroup::getDisplayName is available version 12, not 11 (9.2)Julius Härtl2017-05-041-1/+1
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #4689 from nextcloud/fix-password-protected-mail-sharesBjörn Schießle2017-05-042-2/+52
|\ \ \ | |/ / |/| | check password for mail shares as well
| * | check password for mail shares as wellBjoern Schiessle2017-05-042-2/+52
|/ / | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #4684 from nextcloud/revert-4623-fileinfo-mount-permissionsMorris Jobke2017-05-041-6/+2
|\ \ | | | | | | Revert "fix permissions of mountpoints"
| * | Revert "fix permissions of mountpoints"Morris Jobke2017-05-041-6/+2
|/ /
* | Merge pull request #4682 from ↵Morris Jobke2017-05-045-14/+99
|\ \ | | | | | | | | | | | | nextcloud/try-to-start-browser-sessions-again-when-they-fail-in-acceptance-tests Try to start browser sessions again when they fail in acceptance tests
| * | Set timeout multiplier to 10 for acceptance tests run by DroneDaniel Calviño Sánchez2017-05-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes, acceptance tests run by Drone fail due to a timeout when starting the web browser sessions. Increasing the timeout should minimize the possibility of the failure happening, although it can not guarantee that it will not happen. A timeout multiplier of 10 was set just because it looks like a reasonable margin of time, although it is not based on any hard data. The timeout multiplier affects too the timeout used when finding elements. Like when starting a session, increasing the find timeout simply gives the acceptance tests more time to find the objects before giving up, so it does not change their behaviour when successful and can also prevent failures due to default timeouts being too low for a strained system. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add option to acceptance test runners to set a custom timeout multiplierDaniel Calviño Sánchez2017-05-032-1/+48
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Try again to start browser sessions when they failDaniel Calviño Sánchez2017-05-031-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Starting a session for an Actor can fail, typically, due to a timeout connecting with the web browser. Now if the session fails to start it will be tried again up to "actorTimeoutMultiplier" times in total before giving up. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Generalize attribute nameDaniel Calviño Sánchez2017-05-031-8/+8
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix exponential increase of timeout when finding ancestor elementsDaniel Calviño Sánchez2017-05-031-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timeout passed to the "find" method was multiplied by the "findTimeoutMultiplier" attribute. However, as "find" used "findAncestor" and "findAncestor", in turn, used "find" itself the timeout was increased exponentially for ancestor elements. Now "find" was split in "find" and "findInternal"; the first method is the public one and modifies the given parameters as needed and then calls the second method, private, that performs the find itself. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-0436-4/+252
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2017-05-0338-8/+142
| |
* | Merge pull request #4662 from ↵Morris Jobke2017-05-026-30/+33
|\ \ | | | | | | | | | | | | nextcloud/remove-named-selectors-from-acceptance-tests Remove named selectors from acceptance tests
| * | Replace "named" Mink selectors with "named_exact" Mink selectorsDaniel Calviño Sánchez2017-05-021-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "named" Mink selector first tries to find an exact match for its locator and then, if not found, tries to find a partial match. Besides other harder to track problems (see comment in the commit in which the "content" locator was removed), this could cause, for example, finding an action link titled "Favorited" when looking for the action link titled "Favorite" (that is, one that conveys the opposite state to the one found). Although currently all the acceptance tests are compatible with both the "named" and the "named_exact" Mink selectors the predefined locators are modified to use the "named_exact" Mink selector to make them more future-proof; the "named" Mink selector can still be used if needed through the "customSelector" method in the builder object. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Remove "content" locator from acceptance testsDaniel Calviño Sánchez2017-05-026-16/+19
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "content" locator uses the "named" Mink selector and the "content" Mink locator to find the element. The "named" Mink first tries to find the elements whose content match exactly the given content but, if none is found, then it tries to find elements that just contain the given content. This behaviour can lead to hard to track issues. Finding the exact match and, if not found, finding the partial match is done in quick succession. In most cases, when looking for an exact match the element is already there, it is returned, and everything works as expected. Or it may not be there, but then it is not there either when finding the partial match, so no element is returned, and everything works as expected (that is, the actor tries to find again the element after some time). However, it can also happen that when looking for an exact match there is no element yet, but it appears after trying to find the exact match but before trying to find the partial match. In that situation the desired element would be returned along with its ancestors. However, as only the first found element is taken into account and the ancestors would appear first the find action would be successful, but the returned element would not be the expected one. This is highly unlikely, yet possible, and can cause sporadic failures in acceptance tests that, apparently, work as expected. Using a "named_exact" Mink selector instead of the "named" Mink selector does not provide the desired behaviour in most cases either. As it finds any element whose content matches exactly the given content, looking for "Hello world" in "<div><p><a>Hello world</a></p></div>" would match the "div", "p" and "a" elements; in that situation the "div" element would be the one returned, when typically the "a" element would be the expected one. As it is error prone and easily replaceable by more robust locators the "content" locator was removed from the predefined ones (although it can still be used if needed through the "customSelector" method in the builder object). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #4545 from individual-it/access-control-3726blizzz2017-05-031-10/+19
|\ \ | | | | | | show error message when "files-drop" upload fails
| * | some small refactoring and reformatingArtur Neumann2017-04-271-6/+16
| | | | | | | | | Signed-off-by: Artur Neumann <info@individual-it.net>
| * | use jqXHR.fail() to check for failuresArtur Neumann2017-04-271-10/+9
| | | | | | | | | Signed-off-by: Artur Neumann <info@individual-it.net>
* | | Merge pull request #4623 from nextcloud/fileinfo-mount-permissionsMorris Jobke2017-05-021-2/+6
|\ \ \ | | | | | | | | fix permissions of mountpoints
| * | | fix permissions of mountpointsRobin Appelman2017-05-011-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #4667 from nextcloud/split-up-more-integration-testsMorris Jobke2017-05-023-388/+406
|\ \ \ \ | | | | | | | | | | Split up sharing-v1-part2.feature to avoid timeouts
| * | | | Split up sharing-v1-part2.feature to avoid timeoutsMorris Jobke2017-05-023-388/+406
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #4669 from nextcloud/checkersMorris Jobke2017-05-021-40/+5
|\ \ \ \ \ | | | | | | | | | | | | Consolidate all the code checkers into one job