Commit Graph

42866 Commits

Author SHA1 Message Date
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
Daniel Calviño Sánchez d462ae8507 Use "dropnofiles" callback to disable the drop state in the UI
When a file is dragged from the desktop to the file list the file list
is highlighted, and when the file is finally dropped or the drag
operation is cancelled the highlighting is removed. In some cases, due
to a wrong implementation, a browser may end a file drag with a drop
with no files (for example, when a folder or text is dragged), which
would cause the highlight to not be removed. Now those cases are handled
with the "dropnofiles" callback, which restores the UI and also shows a
message to the user.

The error message is just a generic one, as in some cases it is not even
possible to know whether the problem came from a text drag or a folder
drag, and whether the problem appears or not depends on the browser,
version and even operating system.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-12 15:25:50 +02:00
Daniel Calviño Sánchez 97d6f634b4 Add callback to clean up after misbehaved drag and drop events
The jQuery Plugin triggers the "dragover" callback when the browser
triggers the "dragover" event and the types in their DataTransfer
include a "Files" item. It also triggers the "drop" callback when the
browser triggers the "drop" event and the list of files in its
DataTransfer is not empty.

Unfortunately some browsers may trigger "dragover" events with a
DataTransfer that includes a "Files" item and then trigger a "drop"
event with an empty list of files. When that happens the actions
performed in the "dragXXX" callbacks could be left hanging if they were
expected to be finished in the "drop" callback (for example, if the drop
zone was highlighted during the drag to be then restored when the file
was finally dropped). This commit adds the "dropnofiles" callback to be
able to handle those situations.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-12 15:25:50 +02:00
Daniel Calviño Sánchez 981b757099 Remove duplicated code
"disableDropState" was set as the event handler in 8d4e5747f3, but
the duplicated code was accidentally added back in 786e858d23.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-06-12 15:25:50 +02:00
Nextcloud bot 59a27ceb13
[tx-robot] updated from transifex 2018-06-12 00:13:07 +00:00
Morris Jobke 5c97dc3de3
Merge pull request #9821 from nextcloud/version/noid/13.0.4
13.0.4
2018-06-11 10:21:04 +02:00
Morris Jobke b8ab0a031d
13.0.4
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-11 09:50:54 +02:00
Roeland Jago Douma dfd7ea3c45
Merge pull request #9820 from nextcloud/backport/9798/stable13
[stable13] enable caldav for webdav subtree public-calendars
2018-06-11 09:49:50 +02:00
John Molakvoæ bf7620d868
Merge pull request #9803 from nextcloud/backport/9802/stable13
[stable13] Make the token expiration also work for autocasting 0
2018-06-11 09:16:57 +02:00
Georg Ehrke fa0c51d1dd
enable caldav for webdav subtree public-calendars
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-11 09:15:26 +02:00
Nextcloud bot ebdd9a0408
[tx-robot] updated from transifex 2018-06-11 00:12:58 +00:00
Nextcloud bot c56da1aaab
[tx-robot] updated from transifex 2018-06-10 00:13:21 +00:00
Nextcloud bot 5cd6d9c4a3
[tx-robot] updated from transifex 2018-06-09 00:13:26 +00:00
Roeland Jago Douma 88c7c6abe3
Make the token expiration also work for autocasting 0
Some bad databases don't respect the default null apprently.
Now even if they cast it to 0 it should work just fine.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-08 16:26:30 +02:00
Nextcloud bot c55e842478
[tx-robot] updated from transifex 2018-06-08 00:13:15 +00:00
Morris Jobke 98e9bc33e0
Merge pull request #9788 from nextcloud/notify-credentials-env-13
[13] allow setting notify credentials in environment
2018-06-07 16:14:03 +02:00
Robin Appelman 642bdb5bb5
allow setting notify credentials in environment
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-07 15:47:36 +02:00
Morris Jobke 8a0093d9ca
Merge pull request #9778 from nextcloud/version/noid/13.0.3
13.0.3
2018-06-07 11:43:51 +02:00
Morris Jobke 299c47a565
13.0.3
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-07 11:23:48 +02:00
Nextcloud bot a19310e2cf
[tx-robot] updated from transifex 2018-06-07 00:13:06 +00:00
Nextcloud bot 9009d0cae8
[tx-robot] updated from transifex 2018-06-06 00:12:58 +00:00
Morris Jobke b5b17b0ed0
Merge pull request #9731 from nextcloud/version/noid/13.0.3RC2
13.0.3 RC 2
2018-06-04 17:37:19 +02:00
Morris Jobke 80ae131e3b
13.0.3 RC 2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-04 16:47:54 +02:00
Morris Jobke e656c8e98b
Merge pull request #9732 from nextcloud/stable13-fix-contacts-menu-local-null-check
[stable13] Fix local users check in contacts menu
2018-06-04 16:41:28 +02:00
Christoph Wurst e5fb98d9fc
Fix syntax for php5.6
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-06-04 15:12:57 +02:00
Christoph Wurst 2b0ae6df9f
Fix local users check in contacts menu
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-06-04 15:05:40 +02:00
Morris Jobke 778c411e6c
Merge pull request #9727 from nextcloud/nav-fix
[stable13] Fix header nav
2018-06-04 14:22:16 +02:00
John Molakvoæ (skjnldsv) 0159d4419d
[stable13] Fix header nav
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-04 11:38:45 +02:00
Nextcloud bot 4eea45d981
[tx-robot] updated from transifex 2018-06-04 00:12:47 +00:00
Nextcloud bot 6d3cef1493
[tx-robot] updated from transifex 2018-06-03 00:13:09 +00:00
Nextcloud bot 9dd9da60cc
[tx-robot] updated from transifex 2018-06-02 00:12:51 +00:00
Morris Jobke c04ba4b7af
Merge pull request #9700 from nextcloud/version/noid/13.0.3RC1
13.0.3 RC 1
2018-06-01 15:08:57 +02:00
Morris Jobke 337838a49d
13.0.3 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-06-01 14:41:37 +02:00
Morris Jobke 52b3582250
Merge pull request #9712 from nextcloud/backport/9711/stable13
[stable13] Fix the unit tests
2018-06-01 14:41:14 +02:00
Roeland Jago Douma 718bfb8c3f
Fix the master unit tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-01 14:16:38 +02:00
Morris Jobke 271bbaa809
Merge pull request #9610 from nextcloud/bugfix-stable13/3830/invitations_for_shared_calendars
[stable13] send invitations for shared calendars
2018-06-01 12:37:07 +02:00
Morris Jobke cf4ff7716e
Merge pull request #9694 from nextcloud/backport/9692/stable13
[stable13] Make sure the log doesn't try to read from PUT if it can't
2018-06-01 12:21:26 +02:00
Morris Jobke 5c92da2269
Merge pull request #9707 from nextcloud/bugfix-stable13/noid/override_freebusy_sharing_rules
[stable13] allow admins to override FreeBusy capabilities without modifying ShareAPI capabilities
2018-06-01 12:01:43 +02:00
Nextcloud bot 3595aa68b9
[tx-robot] updated from transifex 2018-06-01 00:12:48 +00:00
Roeland Jago Douma f7372bea86
Merge pull request #9655 from nextcloud/backport/9268/stable13
[stable13] Do not load calendar/addressbook plugins if not needed
2018-05-31 19:53:07 +02:00