903d7fcd6a
Unit tests for #6977
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-01-03 10:46:30 +01:00
a7e67a6ce2
Added additional methods for removal of sensitive info
...
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2018-01-03 10:46:04 +01: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
4ed99dd54b
Merge pull request #7577 from nextcloud/7361_12
...
[stable12] check userExists later, saves lookups for appData_INSTANCEID userids
2017-12-19 15:51:32 +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
fe9f100a1b
Merge pull request #7568 from nextcloud/stable12-fix-duplicate-session-token
...
[stable12] Fix duplicate session token after remembered login
2017-12-19 13:33:35 +01:00
85c18f5980
Fix duplicate session token after remembered login
...
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-12-19 09:17:06 +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
3a99ef5286
Merge pull request #7464 from nextcloud/cached-mount-info-filepath-12
...
[12] Allow getting the filepath when getting cached mounts by fileid
2017-12-13 13:28:25 +01:00
93797b2e5d
Merge pull request #7468 from nextcloud/update-user-agent-regex-stable12
...
allow 'Nextcloud' in the user agent string of Android
2017-12-12 15:44:55 +01:00
1a4eab744e
fix dav unit tests
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 14:38:49 +01:00
003c709d25
allow 'Nextcloud' in the user agent string of Android
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-12 14:38:36 +01:00
3ec1bbbde8
Allow getting the filepath when getting cached mounts by fileid
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-12 14:11:40 +01:00
f44d5bde56
Merge pull request #7456 from nextcloud/12_7342
...
[stable12] CardDAV convertor check should not be to wide
2017-12-12 10:04:40 +01:00
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
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
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
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
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
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
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
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
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
18b464ac9f
Merge pull request #7353 from nextcloud/12-7346
...
[stable12] Fix translation of federation scope menu
2017-12-04 11:12:32 +01:00
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
c772810eca
Merge pull request #7355 from nextcloud/12.0.4-final
...
Release 12.0.4
2017-12-04 08:17:45 +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
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
3ee749d37f
[tx-robot] updated from transifex
2017-12-01 01:10:32 +00:00
d10ba72163
Release 12.0.4
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-30 16:25:04 +01:00
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
8656462edb
[tx-robot] updated from transifex
2017-11-30 01:13:31 +00:00
Joas Schilling
Johannes Schlichenmaier
Morris Jobke
Roeland Jago Douma
Arthur Schiwon
Christoph Wurst
Tobia De Koninck
Bjoern Schiessle
Robin Appelman
Julius Härtl
Roeland Jago Douma
Daniel Calviño Sánchez
Nextcloud bot