Roeland Jago Douma
4b60ada694
Merge pull request #7457 from nextcloud/stable12-7271
...
[stable12] Fix loading icon position in the app menu
2017-12-12 07:50:40 +01:00
Morris Jobke
77b58aeb16
Merge pull request #7455 from nextcloud/12_7230
...
[stable12] Remove wrong entry in admin_settings that causes 500
2017-12-11 22:45:25 +01:00
Julius Härtl
c023486845
Fix loading icon position in the app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-12-11 22:00:20 +01:00
Morris Jobke
d41971184b
Remove wrong entry in admin_settings that causes 500
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-11 21:04:56 +01:00
Morris Jobke
2bd2835526
Merge pull request #7451 from nextcloud/12-7433
...
[stable12] Fix constructor spy in unit test with Sinon 4.1.3
2017-12-11 17:25:36 +01:00
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
1cd5ba3e90
Merge pull request #7144 from nextcloud/rename-locks-stable12
...
Unlock files even if an exception occurs (stable12)
2017-12-04 11:13:19 +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
Morris Jobke
18b464ac9f
Merge pull request #7353 from nextcloud/12-7346
...
[stable12] Fix translation of federation scope menu
2017-12-04 11:12:32 +01:00
Morris Jobke
ad08c1e76b
Merge pull request #7362 from nextcloud/12-7347
...
[stable12] Allow to skip data dir permission checks by config
2017-12-04 11:06:01 +01:00
Morris Jobke
c772810eca
Merge pull request #7355 from nextcloud/12.0.4-final
...
Release 12.0.4
2017-12-04 08:17:45 +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
Arthur Schiwon
17c13e4436
Allow to skip data dir permission checks by config
...
Enables installation on services that don't allow/support permission
changes.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-01 11:55:29 +01:00
Nextcloud bot
3ee749d37f
[tx-robot] updated from transifex
2017-12-01 01:10:32 +00:00
Morris Jobke
d10ba72163
Release 12.0.4
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-30 16:25:04 +01:00
Morris Jobke
4b19c7a851
Fix translation of federation scope menu
...
* l10n in Nextcloud works by extracting the values only passed on their location and not based on the first parameter
* we need to change the translation pool from `core` to `settings` then
* fixes #7345
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-30 13:25:28 +01: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
Morris Jobke
aeae9aefe9
Merge pull request #7330 from nextcloud/1204-rc3
...
12.0.4 RC3
2017-11-28 20:21:47 +01:00
Morris Jobke
b931987cb8
12.0.4 RC3
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-28 20:19:23 +01:00
Morris Jobke
90feccf4be
Merge pull request #7328 from nextcloud/backport/7327/access-list-regression-for-not-current-accesss
...
[stable12] Only in case of $currentAccess the array uses the id as index
2017-11-28 20:16:32 +01:00
Joas Schilling
76a2fb0231
Only in case of $currentAccess the array uses the id as index
...
Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.
Regression from 3820d6883d
2017-11-28 17:24:19 +01:00
Joas Schilling
3cbd6509e0
Fix current access list test and add one for $currentAccess === false
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:24:12 +01: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
Roeland Jago Douma
ee69dc128a
Merge pull request #7261 from nextcloud/prepare-12.0.4-RC2
...
Prepare 12.0.4 RC2
2017-11-27 10:09:30 +01:00
Roeland Jago Douma
7e1ca611f8
Merge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webroot
...
[stable12] CSSResourceLocator: handle SCSS in apps outside root
2017-11-27 10:08:27 +01: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
Lukas Reschke
62b7378331
Merge pull request #7277 from nextcloud/12-7268
...
[stable12] Update CRL due to files_frommail
2017-11-24 14:40:36 +01:00
Morris Jobke
a1c76cc8bf
Update CRL due to files_frommail
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-24 14:11:09 +01:00
Nextcloud bot
e94ba32255
[tx-robot] updated from transifex
2017-11-24 01:10:06 +00:00
Morris Jobke
b901f8b0c8
Merge pull request #7262 from nextcloud/backport/7168/files-access-list-with-integer-userid
...
[stable12] Fix accesslist when a user has an ID only containting 0-9
2017-11-23 13:54:46 +01:00
