Commit graph

39120 commits

Author SHA1 Message Date
Roeland Jago Douma
e5960fe260
Revert "Revert "fix permissions of mountpoints""
This reverts commit 70a0e9c2d3.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 08:41:54 +02:00
Morris Jobke
b04102aab3 Merge pull request #4684 from nextcloud/revert-4623-fileinfo-mount-permissions
Revert "fix permissions of mountpoints"
2017-05-04 00:09:27 -03:00
Morris Jobke
70a0e9c2d3 Revert "fix permissions of mountpoints" 2017-05-04 00:09:09 -03:00
Morris Jobke
61379c9165 Merge pull request #4682 from 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
2017-05-04 00:02:18 -03:00
Nextcloud bot
806aeae71d
[tx-robot] updated from transifex 2017-05-04 00:07:29 +00:00
Felix A. Epp
6f2cc42885 Add radio class to read/write sharing options and 1px left adjustment
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-05-04 01:34:29 +02:00
Felix A. Epp
758576f608 Fix read-only label id
Signed-off-by: Felix A. Epp <work@felixepp.de>
2017-05-04 01:33:03 +02:00
Roeland Jago Douma
2e32ab945b Make files drop more permanent
Implement the suggestions from #2207

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-05-04 00:30:51 +02:00
Daniel Calviño Sánchez
1a83c4c5c3 Set timeout multiplier to 10 for acceptance tests run by Drone
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>
2017-05-03 23:18:40 +02:00
Daniel Calviño Sánchez
4fc9a7146b Add option to acceptance test runners to set a custom timeout multiplier
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-03 23:18:40 +02:00
Daniel Calviño Sánchez
b10478ff19 Try again to start browser sessions when they fail
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>
2017-05-03 23:18:40 +02:00
Daniel Calviño Sánchez
e355e953b5 Generalize attribute name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-03 12:45:52 +02:00
Daniel Calviño Sánchez
97bedb94af Fix exponential increase of timeout when finding ancestor elements
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>
2017-05-03 12:34:04 +02: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
Robin Appelman
c50b7addc7
smaller max logo sizes and cleaner code
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-05-02 13:01:11 -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