1f875eca3c
Merge pull request #7694 from nextcloud/stable12-7611
...
[stable12] Don't attempt to translate login names to uids when uids are provided
2018-01-08 21:10:11 +01:00
e23491dc42
[tx-robot] updated from transifex
2018-01-08 01:11:31 +00:00
116e4e415e
Merge pull request #7717 from nextcloud/stable12-7662
...
[stable12] throw ServerNotAvailableException when LDAP is caught shutting down
2018-01-07 11:40:18 +01:00
ea70bac9fb
[tx-robot] updated from transifex
2018-01-07 01:11:25 +00:00
27a4a8247c
[tx-robot] updated from transifex
2018-01-06 01:11:22 +00:00
37c0352249
throw ServerNotAvailableException when LDAP is caught shutting down
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 20:36:30 +01:00
28d77efe80
Merge pull request #7688 from nextcloud/stable12-fix-scss-webroot-and-url-rewrite
...
[Stable12] fix scss webroot and url rewrite
2018-01-05 17:29:08 +01:00
7bc63f6135
Fix faulty path in theming scss generation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-01-05 08:17:39 +01:00
a3933b99fe
[tx-robot] updated from transifex
2018-01-05 01:11:32 +00:00
32597f8966
test adoption for stable12
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-05 00:10:10 +01:00
233fd16049
[tx-robot] updated from transifex
2018-01-04 09:48:45 +00:00
9ed0f50c25
Merge pull request #7567 from nextcloud/stable-12_fix7428
...
Respect sharing options when searching for Sharees
2017-12-20 14:18:33 +01:00
e788ae0cf6
check userExists later, saves lookups for appData_INSTANCEID userids
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-19 14:13:37 +01:00
7f18a8d19f
Don't show users which e-mail address match if they belong to a group we may not share with
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
2017-12-19 08:43:08 +01:00
6859e5a22a
Merge pull request #7558 from nextcloud/12-7427
...
[stable12] Fix email buttons for white theme
2017-12-18 21:19:51 +01:00
e726d191f1
Fix email buttons for white theme
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-18 17:03:01 +01:00
1a4eab744e
fix dav unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 14:38:49 +01:00
dfed58e947
CardDAV convertor check should not be to wide
...
Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-11 21:14:33 +01:00
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
e4bf23ce7b
[tx-robot] updated from transifex
2017-12-11 01:10:34 +00:00
0ff717c600
[tx-robot] updated from transifex
2017-12-10 01:10:38 +00:00
0c272f2121
[tx-robot] updated from transifex
2017-12-09 01:10:36 +00:00
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
c9318ddd1b
Merge pull request #7407 from nextcloud/12_7348
...
[stable12] Check if owner of share exists
2017-12-08 09:22:07 +01:00
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
53fa7fb3c6
[tx-robot] updated from transifex
2017-12-08 01:10:26 +00:00
8d89ec3c30
[tx-robot] updated from transifex
2017-12-07 01:10:49 +00:00
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
aedc59c636
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-06 09:15:49 +01:00
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
f3b9b213eb
[tx-robot] updated from transifex
2017-12-06 01:10:37 +00:00
e04dd40516
[tx-robot] updated from transifex
2017-12-05 01:10:33 +00:00
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
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
8054f862a3
[tx-robot] updated from transifex
2017-12-04 01:10:42 +00:00
e87c35837f
[tx-robot] updated from transifex
2017-12-03 01:10:35 +00:00
26f8c3adfa
[tx-robot] updated from transifex
2017-12-02 01:10:44 +00:00
3ee749d37f
[tx-robot] updated from transifex
2017-12-01 01:10:32 +00:00
8656462edb
[tx-robot] updated from transifex
2017-11-30 01:13:31 +00:00
0ba10fa5f9
[tx-robot] updated from transifex
2017-11-29 01:10:26 +00:00
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
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
036eae6956
[tx-robot] updated from transifex
2017-11-28 01:10:05 +00:00
298b0d67d8
[tx-robot] updated from transifex
2017-11-27 01:10:03 +00:00
a6b3fcae8f
[tx-robot] updated from transifex
2017-11-25 01:10:10 +00:00
e94ba32255
[tx-robot] updated from transifex
2017-11-24 01:10:06 +00:00
fd46475f6e
[tx-robot] updated from transifex
2017-11-23 01:09:59 +00:00
6b189ba1ee
[tx-robot] updated from transifex
2017-11-21 01:10:20 +00:00
9583910104
[tx-robot] updated from transifex
2017-11-20 01:09:53 +00:00
54dcd70dae
[tx-robot] updated from transifex
2017-11-19 01:10:04 +00:00
Roeland Jago Douma
Nextcloud bot
Arthur Schiwon
Morris Jobke
Julius Härtl
Tobia De Koninck
Bjoern Schiessle
Roeland Jago Douma
Daniel Calviño Sánchez
Robin Appelman
Jan-Christoph Borchardt