Morris Jobke
83d99449d0
Merge pull request #10121 from nextcloud/stable13-allow-disable-encryption
...
[stable13] allow to disable encryption
2018-07-09 14:46:06 +02:00
Bjoern Schiessle
3a45bb52bc
allow to disable encryption
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-05 17:24:09 +02:00
Arthur Schiwon
7f78958056
adjust and add more unit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 12:50:08 +02:00
Arthur Schiwon
37a20cede1
allow admin to disable fetching of avatars as well as a specific attribute
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-05 12:26:45 +02:00
blizzz
486dff0934
Merge pull request #10089 from nextcloud/backport/10083/stable13
...
[stable13] let user set avatar in nextcloud von LDAP provides invalid image data
2018-07-05 00:54:04 +02:00
Morris Jobke
f5bbe21155
Merge pull request #10093 from nextcloud/smb-log-connection-errors-13
...
[13] Improved logging of smb connection errors
2018-07-03 23:05:58 +02:00
Robin Appelman
6d68d34f2f
Improved logging of smb connection errors
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-03 18:12:31 +02:00
Arthur Schiwon
55a6851791
let user set avatar in nextcloud von LDAP provides invalid image data
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-03 13:12:00 +02:00
blizzz
d1df33a190
Merge pull request #10076 from nextcloud/backport/10034/stable13
...
[stable13] lower log level for quota manipulation cases
2018-07-02 13:10:33 +02:00
Arthur Schiwon
ea62d7a9f5
constants belong to Util in 13
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-02 12:51:51 +02:00
Arthur Schiwon
56aaa40dde
lower log level for quota manipulation cases
...
and simplify the forest of ifs a little bit
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-02 11:53:49 +02:00
Morris Jobke
42de484162
Merge pull request #10044 from nextcloud/stable13-10040-fix-filenames-in-sharing-integration-tests
...
[stable13] Fix filenames in sharing integration tests
2018-06-29 09:03:20 +02:00
Daniel Calviño Sánchez
eeab10df11
Check all paths for own files and shares
...
Add "PARENT (2)" and its subdirectories to the paths to be checked, as
before only the own "PARENT" folder was being checked, but not the
shared one.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-29 08:21:55 +02:00
Daniel Calviño Sánchez
6d9b322413
Fix filenames in sharing integration tests
...
When a file is shared and the receiver of the share already has a file
with the same name that file is left untouched, and "(2)" is appended to
the name of the shared file.
As "textfile0.txt" is included in the user folder skeleton all the users
in the integration test have that file, so when it is shared the
receiver sees the share as "/textfile0 (2).txt", and her own file as
"/textfile0.txt".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-29 08:21:55 +02:00
Nextcloud bot
37063bc657
[tx-robot] updated from transifex
2018-06-29 00:12:27 +00:00
Morris Jobke
a5dfc3e0ee
Merge pull request #10032 from nextcloud/backport/10031/stable13
...
[stable13] LDAP backup server should not be queried when auth fails
2018-06-28 08:39:58 +02:00
Nextcloud bot
6292c4857d
[tx-robot] updated from transifex
2018-06-28 00:12:40 +00:00
Arthur Schiwon
993342f6a1
LDAP backup server should not be queried when auth fails
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-06-27 23:15:44 +02:00
Nextcloud bot
fb9f4e3ebf
[tx-robot] updated from transifex
2018-06-27 10:06:32 +00:00
Nextcloud bot
c4e79862c4
[tx-robot] updated from transifex
2018-06-27 00:12:10 +00:00
Roeland Jago Douma
f69c7d7d6c
Merge pull request #9986 from nextcloud/dav-upload-no-partfile-lock-13
...
[13] properly lock the target file on dav upload when not using part files
2018-06-26 09:15:12 +02:00
Nextcloud bot
257c7191b3
[tx-robot] updated from transifex
2018-06-26 00:12:27 +00:00
Robin Appelman
547177b482
properly lock the target file on dav upload when not using part files
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-25 12:18:18 +02:00
Nextcloud bot
ea89600ca0
[tx-robot] updated from transifex
2018-06-25 00:12:07 +00:00
Nextcloud bot
38040951f5
[tx-robot] updated from transifex
2018-06-24 00:12:26 +00:00
Nextcloud bot
891bd63310
[tx-robot] updated from transifex
2018-06-23 00:13:03 +00:00
John Molakvoæ
64b3614182
Merge pull request #9958 from nextcloud/backport/7818/stable13
...
[stable13] Log full exception in cron instead of only the message
2018-06-22 07:37:11 +02:00
Nextcloud bot
3ac6f4d504
[tx-robot] updated from transifex
2018-06-22 00:12:31 +00:00
Morris Jobke
20f1523c0e
Log full exception in cron instead of only the message
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-21 23:17:45 +02:00
Nextcloud bot
869aa64d0d
[tx-robot] updated from transifex
2018-06-21 00:13:07 +00:00
Nextcloud bot
4d8285553a
[tx-robot] updated from transifex
2018-06-20 00:12:46 +00:00
John Molakvoæ
6a29c408e5
Merge pull request #9843 from nextcloud/backport/9724/stable13
...
[stable13] Add parent index to share table
2018-06-19 16:02:13 +02:00
Nextcloud bot
54bc862c9d
[tx-robot] updated from transifex
2018-06-19 00:13:16 +00:00
Nextcloud bot
1b940a3c7e
[tx-robot] updated from transifex
2018-06-18 00:12:54 +00:00
Nextcloud bot
6bc2a993f7
[tx-robot] updated from transifex
2018-06-17 00:13:08 +00:00
Nextcloud bot
3214e69761
[tx-robot] updated from transifex
2018-06-16 00:13:34 +00:00
Nextcloud bot
64835d0acd
[tx-robot] updated from transifex
2018-06-15 00:13:10 +00:00
Nextcloud bot
a5425c7029
[tx-robot] updated from transifex
2018-06-14 00:13:26 +00:00
Roeland Jago Douma
0fa82e585f
Merge pull request #9837 from nextcloud/stable13-9807-fix-highlighting-of-the-upload-drop-zone
...
[stable13] Fix highlighting of the upload drop zone
2018-06-13 08:30:50 +02:00
John Molakvoæ
0d9c33838b
Merge pull request #9839 from nextcloud/backport/8221/stable13
...
[stable13] Apply ldapUserFilter on members of group
2018-06-13 06:55:41 +02:00
Nextcloud bot
cf8860e5ba
[tx-robot] updated from transifex
2018-06-13 00:13:22 +00:00
blizzz
f43fb0d5d0
Merge pull request #9844 from nextcloud/backport/9276/remove-unused-config-sample
...
[stable13] Remove unused config option
2018-06-12 23:33:53 +02:00
Morris Jobke
8a98b44fc4
Remove unused config option
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-12 22:27:08 +02:00
Morris Jobke
6945e1fae6
Merge pull request #9841 from nextcloud/backport/9814/stable13
...
[stable13] Make the DELETION of groups match greedy on the groupID
2018-06-12 22:17:25 +02:00
Roeland Jago Douma
191cc74386
Add parent index to share table
...
Fixes #9327
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-12 21:09:20 +02:00
Roeland Jago Douma
d269258ac9
Make the DELETION of groups match greedy on the groupID
...
fixes #6032
Now since the match is greedy it will also eat the /
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-12 20:58:13 +02:00
Roland Tapken
ed78703275
dn2ocname: also apply group filter to readAttribute()
...
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-06-12 18:21:22 +02:00
Roland Tapken
57a8fa1b22
Apply ldapUserFilter on members of group
...
Refers to issue #8220
user_ldap configured with custom filters for active directory access
(group-member-association is "member"). Then it can happen that the
members of a group contain members that don't belong to the users
available in Nextcloud (the most trivial reason is that the user filter
contains "(!(UserAccountControl:1.2.840.113556.1.4.803:=2))" to exclude
disabled users from being imported).
This can be fixed by applying the ldapUserFilter when resolving the UID
for a DN fetched from the group's member list.
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2018-06-12 18:21:11 +02:00
Daniel Calviño Sánchez
85d9264a14
Do not show an error message when draging and dropping text
...
When the browser reports a drag of items other than files (for example,
text) and then triggers a drop event with no files no error message
should be shown to the user, as in that case there would be no highlight
of the drop zone and no indication that the drop would be valid (except
for the mouse cursor); the error message should be shown only when
the drop event with no files follows a file drag.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-12 15:25:50 +02:00
Daniel Calviño Sánchez
d4143af5ed
Remove no longer needed special handling for Firefox
...
The highlighting was removed in Firefox when the cursor was no longer
moving to handle the behaviour of reporting a file drag and then
providing no files in the drop event. That behaviour (which was only
present in Firefox 48 and 49) is already handled with the "dropnofiles"
callback, so that special handling is no longer needed.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-12 15:25:50 +02:00