bd0672530b
Move on with the next user if we found the user on one user back-end
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-04 17:13:47 +02:00
ce7a835772
Merge pull request #9017 from nextcloud/smb-2.0.5-13
...
[13] update icewind/smb to 2.0.5
2018-04-04 14:08:28 +02:00
ba29fd19ec
Merge pull request #9072 from nextcloud/backport/8891/fix_8890-13
...
[stable13] Fix proper permissions for multiple file access
2018-04-04 13:59:05 +02:00
36bd4b7dde
When formatting a share node an Empty target is invalid
...
Fixes #9028
For federated shares the share table holds no target information (since
it is on the other server). So when a node is actually invalid and not
found we should not display it anymore in the shared with sections etc
and thus throw the proper exceptions.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:03:25 +02:00
af317a1e38
Fix test
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:02:42 +02:00
5a74b9cb99
Fix proper permissions for multiple file access
...
Fixes #8890
In case you have access to a file via multiple ways, for example:
1. the file is shared with you with permission read only
2. the folder containing the file is shared with your read/write
Requesting the getById function on the userFolder would give back two
entries but both with the same permissions. Depending on the node you
picked this is not right.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 12:02:37 +02:00
df09b65ee9
Do not treat is-encrypted as customer property
...
fixes #8977
Else for all files in a folder we would launch off more queries.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-04 11:56:59 +02:00
e95184ee25
Merge pull request #9064 from nextcloud/fix-copy-encrypted-files-stable13
...
[stable13] reset encryptionVersion to '1' if a file was stream copied
2018-04-04 11:54:54 +02:00
ef14f3c0b0
[tx-robot] updated from transifex
2018-04-04 00:13:52 +00:00
d4f64b94f2
reset encryptionVersion to '1' if a file was stream copied, because this means that we basically write the file from scratch
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-04-03 18:12:16 +02:00
a0818ab6be
Merge pull request #9019 from nextcloud/stable13-8939
...
[stable13] Fix search text overlapping close button
2018-04-03 10:29:33 +02:00
7bb8ce0e67
Merge pull request #9015 from nextcloud/backport-apps-versions
...
[stable13] Use app version to generate scss filename
2018-04-03 10:28:17 +02:00
4f5d057777
Merge pull request #9020 from nextcloud/stable13-8983
...
[stable13] Clear any theming prefixed cache on cache buster increase
2018-04-03 10:09:33 +02:00
e5684a9287
[tx-robot] updated from transifex
2018-04-03 00:12:13 +00:00
9c1c47400f
[tx-robot] updated from transifex
2018-04-02 00:12:13 +00:00
4f34eb7616
[tx-robot] updated from transifex
2018-04-01 00:12:11 +00:00
77bdbb6443
[tx-robot] updated from transifex
2018-03-31 00:14:19 +00:00
b6cb092bc6
[tx-robot] updated from transifex
2018-03-30 00:12:01 +00:00
ea01c9e92d
[tx-robot] updated from transifex
2018-03-29 00:14:00 +00:00
7f209be51d
Fix tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:35:36 +02:00
541bb71513
Clear any theming prefixed cache on cache buster increase
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:35:35 +02:00
334d733d48
Fix search text overlapping clode button
...
fixes #8701
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-28 17:30:16 +02:00
6e13e31188
update icewind/smb to 2.0.5
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:17:56 +02:00
a691b52daf
Revert "update icewind/smb to 2.0.5"
...
accidental push to wrong branch
This reverts commit 3b35cd0749
2018-03-28 16:17:30 +02:00
3b35cd0749
update icewind/smb to 2.0.5
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-28 16:15:27 +02:00
05f76b3469
Use app version to generate scss filename
...
Fixed scsscacher tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-28 16:11:10 +02:00
f2e69bd868
[tx-robot] updated from transifex
2018-03-28 00:21:41 +00:00
c2ec519bc4
[tx-robot] updated from transifex
2018-03-27 00:12:04 +00:00
f8b1acfcfd
[tx-robot] updated from transifex
2018-03-26 00:13:40 +00:00
cda89f16d8
[tx-robot] updated from transifex
2018-03-25 01:10:27 +00:00
3604fe1ec5
[tx-robot] updated from transifex
2018-03-24 01:12:43 +00:00
6ef65b3016
[tx-robot] updated from transifex
2018-03-23 01:11:55 +00:00
b3ffcda8ff
[tx-robot] updated from transifex
2018-03-22 01:12:05 +00:00
684f6b6429
[tx-robot] updated from transifex
2018-03-21 01:12:19 +00:00
52a97e826b
Merge pull request #8905 from nextcloud/stable13-8843-set-share-with-field-to-the-id-of-the-circle
...
[stable13] Set "share with" field to the ID of the circle
2018-03-20 23:17:25 +01:00
d9f512e593
Merge pull request #8900 from nextcloud/backport/8822/stable13
...
[stable13] the FN is optional, carrying the displayname if present
2018-03-20 23:16:59 +01:00
3bd92edd9c
Use the display name in the avatar for a circle share
...
Before, the avatar for a circle share was generated using the
"share_with" field as the seed for "imageplaceholder". Due to this, when
the "share_with" field is set to the circle ID the character shown in
the avatar was just a random character instead of the first character of
the display name. Now the "share_with" is still used as the seed for the
colour, but the display name is used as the text of the avatar.
This adds support for "share_with" fields set to the circle ID while
being backwards compatible with "share_with" fields set to the circle
name.
Note that when "share_with" fields is set to the circle name the colour
of the avatar is different in the list of suggested sharees and in the
list of current sharees, but that also happened before these changes
(due to a different seed being used in each place).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:42:27 +01:00
df5cd18394
Set "share_with" field to the ID of the circle
...
When a share is shared with a circle the "share_with" field returned by
the API endpoint was always set to the name of the circle. However, the
name is not enough to identify a circle. The Circles app now provides
the ID of the circle in the "shared with" field of a Share, so this
commit modifies the API endpoint to set the "share_with" field to the ID
of the circle when provided by the Circles app.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-20 19:42:27 +01:00
e2e27004ff
the FN is optional, carrying the displayname if present
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-20 14:35:46 +01:00
a6f1721c2d
[tx-robot] updated from transifex
2018-03-20 01:11:59 +00:00
17ae973d6f
[tx-robot] updated from transifex
2018-03-19 01:12:01 +00:00
2b57ddc74d
[tx-robot] updated from transifex
2018-03-18 01:12:13 +00:00
23022d5dd7
[tx-robot] updated from transifex
2018-03-17 01:11:55 +00:00
9117a982f4
Merge pull request #8849 from nextcloud/backport/8835/stable13
...
[stable13] group existence check works without attribute (like with users)
2018-03-16 14:25:18 +01:00
5e15c76d21
Fix unit tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-16 10:50:18 +01:00
588ee6af06
existence check works without attribute (like with users)
...
cn is not necessarily given everywhere
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-16 10:26:29 +01:00
161a0f29d9
[tx-robot] updated from transifex
2018-03-16 01:11:55 +00:00
4939ff36a0
[tx-robot] updated from transifex
2018-03-15 01:12:05 +00:00
66eaea9259
[tx-robot] updated from transifex
2018-03-14 01:11:56 +00:00
c2cea293d5
Merge pull request #8807 from nextcloud/final-13.0.1
...
[stable13] 13.0.1
2018-03-13 19:46:51 +01:00
Bjoern Schiessle
Roeland Jago Douma
Morris Jobke
Roeland Jago Douma
Nextcloud bot
Julius Härtl
Robin Appelman
John Molakvoæ (skjnldsv)
Daniel Calviño Sánchez
Arthur Schiwon
Joas Schilling