summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
| * | | | | Consolidate all the code checkers into one jobMorris Jobke2017-05-021-40/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4665 from nextcloud/enable-redisMorris Jobke2017-05-023-0/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add redis support to our CI jobs
| * | | | | | Add redis support to our CI jobsMorris Jobke2017-05-023-0/+36
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4620 from nextcloud/preview-error-handlingRoeland Jago Douma2017-05-029-6/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | better handling of preview generation errors
| * | | | | | fix preview testsRobin Appelman2017-05-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | Handle more error casesMorris Jobke2017-05-024-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | Add PHPDocMorris Jobke2017-05-023-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | better handling of preview generation errorsRobin Appelman2017-05-022-4/+9
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #4664 from nextcloud/redis-sample-config.phpLukas Reschke2017-05-021-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve documentation for redis cluster
| * | | | | | Improve documentationMorris Jobke2017-05-021-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4611 from nextcloud/js-use-dot-notationRoeland Jago Douma2017-05-026-9/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Use dot notation for array access - JSLint recommendation
| * | | | | Use dot notation for array access - JSLint recommendationMorris Jobke2017-05-016-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menuLukas Reschke2017-05-022-0/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not show an email action for contacts with emtpy email addresses
| * | | | | | Do not show an email action for contacts with emtpy email addressesChristoph Wurst2017-05-022-0/+28
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #4636 from nextcloud/jquery-migrate-browserLukas Reschke2017-05-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove dependency on jquery-migrate.js for browser detection
| * | | | | | Remove dependency on jquery-migrate.js for browser detectionMorris Jobke2017-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ref #4628 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #4660 from nextcloud/fix/hide-2fa-backup-codesLukas Reschke2017-05-023-8/+111
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Hide 2FA backup codes if no other 2FA providers are enabled
| * | | | | | | Hide 2FA backup codes if no other 2FA providers are enabledChristoph Wurst2017-05-023-8/+111
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | Merge pull request #4657 from nextcloud/add_caching_imageexportRoeland Jago Douma2017-05-022-1/+20
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Add caching imageexport
| * | | | | | Fix testsRoeland Jago Douma2017-05-021-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Add caching to the imageexport pluginRoeland Jago Douma2017-05-021-0/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we now heavily use this endpoint for the contacts menu we better set proper caching on the images. Else this gets reload over and over again leading to slow loading menu and unneded bytes transfered. * cache for 1 hour by default * added ETag for validation Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4651 from nextcloud/fix_appfetcher_updateMorris Jobke2017-05-026-36/+61
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Make sure the AppFetcher fetches the new applist from the appstore
| * | | | | Bump versionRoeland Jago Douma2017-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix testRoeland Jago Douma2017-05-021-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Make sure the AppFetcher fetches the new applist from the appstoreRoeland Jago Douma2017-05-024-15/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in the upgrade process the version in the config is still the old version. (Since we only upgrade it after the upgrade is complete). However the app list fetched from the appstore must be the new list. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #4638 from nextcloud/fix-copy-tooltipLukas Reschke2017-05-021-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix "Copied" message for public links
| * | | | | | Fix "Copied" message for public linksMorris Jobke2017-05-011-3/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * share a file/fodler by public link and click the copy to clipboard icon and watch the tooltip * before: it said "Copy" * after: it now says "Copied" after clicking the button Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4649 from nextcloud/update-links-to-12Lukas Reschke2017-05-022-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Update documentation go.php URL to 12
| * | | | | Update documentation go.php URL to 12Lukas Reschke2017-05-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4646 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4650 from nextcloud/appcache_on_updatev12.0.0beta1Lukas Reschke2017-05-023-78/+129
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Do not use caching for appstore fetchers after upgrade
| * | | | | Bump versionRoeland Jago Douma2017-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Fix and update testsRoeland Jago Douma2017-05-021-65/+116
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Do not do ETag caching when the version is updatedRoeland Jago Douma2017-05-021-12/+12
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-02112-922/+2648
| | | | |
* | | | | Merge pull request #4630 from ↵Morris Jobke2017-05-012-7/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/mark-ip-as-whitelisted-if-bruteforce-protection-is-disabled Mark IP as whitelisted if brute force protection is disabled
| * | | | | Add missing spaceLukas Reschke2017-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Mark IP as whitelisted if brute force protection is disabledLukas Reschke2017-05-012-8/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when disabling the brute force protection no new brute force attempts are logged. However, the ones logged within the last 24 hours will still be used for throttling. This is quite an unexpected behaviour and caused some support issues. With this change when the brute force protection is disabled also the existing attempts within the last 24 hours will be disregarded. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4626 from nextcloud/adjust-shipped-jsonLukas Reschke2017-05-011-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove apps delivered from the appstore
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 20:27:14 +0000