Daniel Calviño Sánchez
26cf16d67f
Fix constructor spy in unit test with Sinon 4.1.3
...
When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.
Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.
Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.
Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-11 16:49:39 +01:00
Nextcloud bot
e4bf23ce7b
[tx-robot] updated from transifex
2017-12-11 01:10:34 +00:00
Nextcloud bot
0ff717c600
[tx-robot] updated from transifex
2017-12-10 01:10:38 +00:00
Nextcloud bot
0c272f2121
[tx-robot] updated from transifex
2017-12-09 01:10:36 +00:00
Roeland Jago Douma
ac29608db6
Merge pull request #7409 from nextcloud/swift-retry-12
...
[12]add retry wrapper when reading files from swift
2017-12-08 09:26:41 +01:00
Morris Jobke
c9318ddd1b
Merge pull request #7407 from nextcloud/12_7348
...
[stable12] Check if owner of share exists
2017-12-08 09:22:07 +01:00
Morris Jobke
5dd15c4a7d
Merge pull request #7323 from nextcloud/shared-jailed-source-root-12
...
[12]Use the correct root for shared jail when the source storage is also a jail
2017-12-08 09:03:03 +01:00
Nextcloud bot
53fa7fb3c6
[tx-robot] updated from transifex
2017-12-08 01:10:26 +00:00
Nextcloud bot
8d89ec3c30
[tx-robot] updated from transifex
2017-12-07 01:10:49 +00:00
Robin Appelman
0519ca5893
add retry wrapper when reading files from swift
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-06 15:43:00 +01:00
Roeland Jago Douma
aedc59c636
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-06 09:15:49 +01:00
Roeland Jago Douma
7e6dd02441
A failed storage is a not available storage
...
We have to double check. Since getting the info of the root returns a
generic entry. But actually the stroage is not available. Else we get
very weird sync and web behavior.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-06 09:15:43 +01:00
Nextcloud bot
f3b9b213eb
[tx-robot] updated from transifex
2017-12-06 01:10:37 +00:00
Nextcloud bot
e04dd40516
[tx-robot] updated from transifex
2017-12-05 01:10:33 +00:00
Robin Appelman
4144580167
delay calculating the shared cache root until it's used
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:18:23 +01:00
Morris Jobke
b1b02d3b3a
Merge pull request #7322 from nextcloud/12-6303
...
[stable12] Set primary action button color to same as theming color
2017-12-04 11:12:51 +01:00
Nextcloud bot
8054f862a3
[tx-robot] updated from transifex
2017-12-04 01:10:42 +00:00
Nextcloud bot
e87c35837f
[tx-robot] updated from transifex
2017-12-03 01:10:35 +00:00
Nextcloud bot
26f8c3adfa
[tx-robot] updated from transifex
2017-12-02 01:10:44 +00:00
Nextcloud bot
3ee749d37f
[tx-robot] updated from transifex
2017-12-01 01:10:32 +00:00
Nextcloud bot
8656462edb
[tx-robot] updated from transifex
2017-11-30 01:13:31 +00:00
Nextcloud bot
0ba10fa5f9
[tx-robot] updated from transifex
2017-11-29 01:10:26 +00:00
Robin Appelman
6d8de960c9
Use the correct root for shared jail when the source storage is also a jail
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-28 13:55:42 +01:00
Jan-Christoph Borchardt
1a18b48037
Set primary action button color to same as theming color
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-28 13:50:57 +01:00
Nextcloud bot
036eae6956
[tx-robot] updated from transifex
2017-11-28 01:10:05 +00:00
Nextcloud bot
298b0d67d8
[tx-robot] updated from transifex
2017-11-27 01:10:03 +00:00
Nextcloud bot
a6b3fcae8f
[tx-robot] updated from transifex
2017-11-25 01:10:10 +00:00
Nextcloud bot
e94ba32255
[tx-robot] updated from transifex
2017-11-24 01:10:06 +00:00
Nextcloud bot
fd46475f6e
[tx-robot] updated from transifex
2017-11-23 01:09:59 +00:00
Nextcloud bot
6b189ba1ee
[tx-robot] updated from transifex
2017-11-21 01:10:20 +00:00
Nextcloud bot
9583910104
[tx-robot] updated from transifex
2017-11-20 01:09:53 +00:00
Nextcloud bot
54dcd70dae
[tx-robot] updated from transifex
2017-11-19 01:10:04 +00:00
Nextcloud bot
ccf4f87441
[tx-robot] updated from transifex
2017-11-18 01:10:56 +00:00
Nextcloud bot
9942c39e64
[tx-robot] updated from transifex
2017-11-17 01:10:03 +00:00
Nextcloud bot
fec4e3947e
[tx-robot] updated from transifex
2017-11-16 01:10:03 +00:00
Nextcloud bot
2d8d248d28
[tx-robot] updated from transifex
2017-11-15 01:10:00 +00:00
Nextcloud bot
82e4d9b9cc
[tx-robot] updated from transifex
2017-11-14 01:09:59 +00:00
Nextcloud bot
b1ac0b6198
[tx-robot] updated from transifex
2017-11-13 01:10:31 +00:00
Nextcloud bot
faabc3594d
[tx-robot] updated from transifex
2017-11-12 01:10:15 +00:00
Nextcloud bot
097e8a4994
[tx-robot] updated from transifex
2017-11-11 01:10:24 +00:00
Nextcloud bot
5e14b64c55
[tx-robot] updated from transifex
2017-11-10 01:10:05 +00:00
Nextcloud bot
656ea773e1
[tx-robot] updated from transifex
2017-11-09 09:12:53 +00:00
Morris Jobke
c91515cfed
Merge pull request #6847 from nextcloud/filelist-confict-path-12
...
[12] still trigger conflict resolution for existing entries when the curre…
2017-11-09 09:34:24 +01:00
Nextcloud bot
69e61b2892
[tx-robot] updated from transifex
2017-11-09 01:09:28 +00:00
Nextcloud bot
98b012d545
[tx-robot] updated from transifex
2017-11-08 01:09:33 +00:00
Lukas Reschke
4d117a5e23
Merge pull request #7096 from nextcloud/backport-stable12-7042
...
[stable12] ensure uid for calendar objects is unique
2017-11-07 21:58:02 +01:00
Robin Appelman
fe6b4d432b
never show '/' as path for conflicting file names
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:11 +01:00
Robin Appelman
e51acfc717
still trigger conflict resolution for existing entries when the current entry doesn't need it
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:07 +01:00
Morris Jobke
70e20727e5
Merge pull request #6699 from nextcloud/backport-6522-stable12
...
[stable12] fix LDAP User deletion (cleanup), fixes #3365
2017-11-07 14:45:06 +01:00
Georg Ehrke
3059191444
ensure uid for calendar objects is unique
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-07 13:18:38 +01:00
