Commit Graph

38899 Commits

Author SHA1 Message Date
Nextcloud bot 806aeae71d
[tx-robot] updated from transifex 2017-05-04 00:07:29 +00:00
Nextcloud bot 3dbf30c220
[tx-robot] updated from transifex 2017-05-03 00:07:31 +00:00
Morris Jobke dbe11916fa Merge pull request #4662 from nextcloud/remove-named-selectors-from-acceptance-tests
Remove named selectors from acceptance tests
2017-05-02 20:44:23 -03:00
blizzz 4e4bc17ff5 Merge pull request #4545 from individual-it/access-control-3726
show error message when "files-drop" upload fails
2017-05-03 00:21:40 +02:00
Morris Jobke aa39f9b8fc Merge pull request #4623 from nextcloud/fileinfo-mount-permissions
fix permissions of mountpoints
2017-05-02 17:28:33 -03:00
Morris Jobke a94c706f26 Merge pull request #4667 from nextcloud/split-up-more-integration-tests
Split up sharing-v1-part2.feature to avoid timeouts
2017-05-02 17:27:37 -03:00
Morris Jobke c079ca7651 Merge pull request #4669 from nextcloud/checkers
Consolidate all the code checkers into one job
2017-05-02 17:27:00 -03:00
Morris Jobke f233e856bf Merge pull request #4665 from nextcloud/enable-redis
Add redis support to our CI jobs
2017-05-02 17:16:19 -03:00
Roeland Jago Douma 24ff230f93 Merge pull request #4620 from nextcloud/preview-error-handling
better handling of preview generation errors
2017-05-02 21:49:14 +02:00
Lukas Reschke 34b8ea6ebf Merge pull request #4664 from nextcloud/redis-sample-config.php
Improve documentation for redis cluster
2017-05-02 21:46:34 +02:00
Roeland Jago Douma 6d9cb62f79 Merge pull request #4611 from nextcloud/js-use-dot-notation
Use dot notation for array access - JSLint recommendation
2017-05-02 21:44:44 +02:00
Morris Jobke a1929f4d56
Consolidate all the code checkers into one job
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 16:04:09 -03:00
Morris Jobke ecb369b5e8
Add redis support to our CI jobs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 15:55:42 -03:00
Morris Jobke 865cd487c4
Split up sharing-v1-part2.feature to avoid timeouts
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 12:55:29 -03:00
Morris Jobke 1e75206670
Improve documentation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 12:42:06 -03:00
Lukas Reschke 121cb4bcfc Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menu
Do not show an email action for contacts with emtpy email addresses
2017-05-02 17:02:16 +02:00
Lukas Reschke 68a1902586 Merge pull request #4636 from nextcloud/jquery-migrate-browser
Remove dependency on jquery-migrate.js for browser detection
2017-05-02 17:01:27 +02:00
Lukas Reschke db337b4285 Merge pull request #4660 from nextcloud/fix/hide-2fa-backup-codes
Hide 2FA backup codes if no other 2FA providers are enabled
2017-05-02 16:08:11 +02:00
Roeland Jago Douma cd631e5b9e Merge pull request #4657 from nextcloud/add_caching_imageexport
Add caching imageexport
2017-05-02 15:57:29 +02:00
Morris Jobke 705483e712 Merge pull request #4651 from nextcloud/fix_appfetcher_update
Make sure the AppFetcher fetches the new applist from the appstore
2017-05-02 10:45:04 -03:00
Daniel Calviño Sánchez 1381f6c131 Replace "named" Mink selectors with "named_exact" Mink selectors
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>
2017-05-02 15:09:38 +02:00
Daniel Calviño Sánchez 762a8e0b76 Remove "content" locator from acceptance tests
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>
2017-05-02 15:09:25 +02:00
Christoph Wurst d8b3fe460e
Hide 2FA backup codes if no other 2FA providers are enabled
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-02 14:40:44 +02:00
Christoph Wurst b13c741cb3
Do not show an email action for contacts with emtpy email addresses
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-02 14:12:04 +02:00
Robin Appelman 2847e9f2e3
fix preview tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-02 13:43:48 +02:00
Morris Jobke 23cc309606
Handle more error cases
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 13:43:48 +02:00
Morris Jobke 6aac094091
Add PHPDoc
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-02 13:43:47 +02:00
Robin Appelman 4dfd90abc4
better handling of preview generation errors
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-02 13:43:47 +02:00
Roeland Jago Douma d25e13ea27
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 12:39:37 +02:00
Roeland Jago Douma 59e27f03b6
Add caching to the imageexport plugin
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>
2017-05-02 12:30:34 +02:00
Roeland Jago Douma 73b4ef53f0
Bump version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 11:38:37 +02:00
Roeland Jago Douma ae7c1504a9
Fix test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 11:38:21 +02:00
Roeland Jago Douma e79424932a
Make sure the AppFetcher fetches the new applist from the appstore
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>
2017-05-02 10:24:10 +02:00
Lukas Reschke 94c2f12226 Merge pull request #4638 from nextcloud/fix-copy-tooltip
Fix "Copied" message for public links
2017-05-02 10:10:23 +02:00
Lukas Reschke d4217830c6 Merge pull request #4649 from nextcloud/update-links-to-12
Update documentation go.php URL to 12
2017-05-02 10:09:57 +02:00
Lukas Reschke 81ee0673a5 Merge pull request #4650 from nextcloud/appcache_on_update
Do not use caching for appstore fetchers after upgrade
2017-05-02 09:15:35 +02:00
Roeland Jago Douma aa4cebe749
Bump version
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 09:00:09 +02:00
Roeland Jago Douma 762284ce93
Fix and update tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 08:59:53 +02:00
Roeland Jago Douma 095463d568
Do not do ETag caching when the version is updated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-02 08:44:20 +02:00
Lukas Reschke 6458875dc1
Update documentation go.php URL to 12
Fixes https://github.com/nextcloud/server/issues/4646

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-02 08:17:59 +02:00
Nextcloud bot f27d382c47
[tx-robot] updated from transifex 2017-05-02 00:07:20 +00:00
Morris Jobke af6f5e8fad Merge pull request #4630 from nextcloud/mark-ip-as-whitelisted-if-bruteforce-protection-is-disabled
Mark IP as whitelisted if brute force protection is disabled
2017-05-01 18:03:39 -03:00
Morris Jobke 2ce71f8c24
Fix "Copied" message for public links
* 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>
2017-05-01 17:58:12 -03:00
Morris Jobke 242934c016
Remove dependency on jquery-migrate.js for browser detection
* ref #4628

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-01 17:53:48 -03:00
Lukas Reschke 72dd4425c9 Merge pull request #4626 from nextcloud/adjust-shipped-json
Remove apps delivered from the appstore
2017-05-01 20:49:43 +02:00
Lukas Reschke 8cb3115acf Merge pull request #4615 from nextcloud/js-reduce-share.js-complexity
Remove abandoned methods in OC.Share that refer to old API endpoints
2017-05-01 20:44:19 +02:00
Lukas Reschke dd03fdebec
Add missing space
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-01 20:36:25 +02:00
Roeland Jago Douma 4904117ba8 Merge pull request #4612 from nextcloud/js-fix-long-lines
Fix some long lines in JS - JSLinut recommendation
2017-05-01 19:55:56 +02:00
Roeland Jago Douma 92b73db053 Merge pull request #4613 from nextcloud/remove-unused
Remove unused JS file
2017-05-01 19:42:12 +02:00
Lukas Reschke a5ccb31e85
Mark IP as whitelisted if brute force protection is disabled
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>
2017-05-01 18:31:45 +02:00