summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-06-1622-30/+100
|
* [tx-robot] updated from transifexNextcloud bot2018-06-1582-72/+556
|
* [tx-robot] updated from transifexNextcloud bot2018-06-14338-3476/+3040
|
* Merge pull request #9837 from ↵Roeland Jago Douma2018-06-132-16/+36
|\ | | | | | | | | nextcloud/stable13-9807-fix-highlighting-of-the-upload-drop-zone [stable13] Fix highlighting of the upload drop zone
| * Do not show an error message when draging and dropping textDaniel Calviño Sánchez2018-06-121-0/+10
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Remove no longer needed special handling for FirefoxDaniel Calviño Sánchez2018-06-121-15/+8
| | | | | | | | | | | | | | | | | | | | 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>
| * Use "dropnofiles" callback to disable the drop state in the UIDaniel Calviño Sánchez2018-06-121-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Add callback to clean up after misbehaved drag and drop eventsDaniel Calviño Sánchez2018-06-121-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Remove duplicated codeDaniel Calviño Sánchez2018-06-121-6/+1
| | | | | | | | | | | | | | "disableDropState" was set as the event handler in 8d4e5747f386a0, but the duplicated code was accidentally added back in 786e858d23c4a4. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #9839 from nextcloud/backport/8221/stable13John Molakvoæ2018-06-131-2/+4
|\ \ | | | | | | [stable13] Apply ldapUserFilter on members of group
| * | dn2ocname: also apply group filter to readAttribute()Roland Tapken2018-06-121-6/+4
| | | | | | | | | | | | Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
| * | Apply ldapUserFilter on members of groupRoland Tapken2018-06-121-1/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | [tx-robot] updated from transifexNextcloud bot2018-06-13196-1634/+1856
| |
* | Merge pull request #9844 from ↵blizzz2018-06-121-6/+0
|\ \ | | | | | | | | | | | | nextcloud/backport/9276/remove-unused-config-sample [stable13] Remove unused config option
| * | Remove unused config optionMorris Jobke2018-06-121-6/+0
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9841 from nextcloud/backport/9814/stable13Morris Jobke2018-06-121-1/+1
|\ \ | |/ |/| [stable13] Make the DELETION of groups match greedy on the groupID
| * Make the DELETION of groups match greedy on the groupIDRoeland Jago Douma2018-06-121-1/+1
|/ | | | | | | | fixes #6032 Now since the match is greedy it will also eat the / Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2018-06-1256-2/+158
|
* Merge pull request #9821 from nextcloud/version/noid/13.0.4v13.0.4Morris Jobke2018-06-111-2/+2
|\ | | | | 13.0.4
| * 13.0.4Morris Jobke2018-06-111-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #9820 from nextcloud/backport/9798/stable13Roeland Jago Douma2018-06-111-1/+1
|\ | | | | [stable13] enable caldav for webdav subtree public-calendars
| * enable caldav for webdav subtree public-calendarsGeorg Ehrke2018-06-111-1/+1
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #9803 from nextcloud/backport/9802/stable13John Molakvoæ2018-06-111-1/+1
|\ \ | |/ |/| [stable13] Make the token expiration also work for autocasting 0
| * Make the token expiration also work for autocasting 0Roeland Jago Douma2018-06-081-1/+1
| | | | | | | | | | | | | | 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>
* | [tx-robot] updated from transifexNextcloud bot2018-06-116-0/+18
| |
* | [tx-robot] updated from transifexNextcloud bot2018-06-1010-4/+32
| |
* | [tx-robot] updated from transifexNextcloud bot2018-06-0932-0/+108
|/
* [tx-robot] updated from transifexNextcloud bot2018-06-08276-11600/+11754
|
* Merge pull request #9788 from nextcloud/notify-credentials-env-13Morris Jobke2018-06-071-0/+8
|\ | | | | [13] allow setting notify credentials in environment
| * allow setting notify credentials in environmentRobin Appelman2018-06-071-0/+8
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #9778 from nextcloud/version/noid/13.0.3v13.0.3Morris Jobke2018-06-071-2/+2
|\ \ | | | | | | 13.0.3
| * | 13.0.3Morris Jobke2018-06-071-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2018-06-07170-14454/+15014
| |
* | [tx-robot] updated from transifexNextcloud bot2018-06-0630-2/+42
| |
* | Merge pull request #9731 from nextcloud/version/noid/13.0.3RC2v13.0.3RC2Morris Jobke2018-06-041-2/+2
|\ \ | | | | | | 13.0.3 RC 2
| * | 13.0.3 RC 2Morris Jobke2018-06-041-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9732 from ↵Morris Jobke2018-06-041-1/+2
|\ \ | | | | | | | | | | | | nextcloud/stable13-fix-contacts-menu-local-null-check [stable13] Fix local users check in contacts menu
| * | Fix syntax for php5.6Christoph Wurst2018-06-041-1/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Fix local users check in contacts menuChristoph Wurst2018-06-041-1/+2
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #9727 from nextcloud/nav-fixMorris Jobke2018-06-041-1/+1
|\ \ | | | | | | [stable13] Fix header nav
| * | [stable13] Fix header navJohn Molakvoæ (skjnldsv)2018-06-041-1/+1
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2018-06-0414-36/+38
| |
* | [tx-robot] updated from transifexNextcloud bot2018-06-0310-18/+20
| |
* | [tx-robot] updated from transifexNextcloud bot2018-06-026-146/+156
| |
* | Merge pull request #9700 from nextcloud/version/noid/13.0.3RC1v13.0.3RC1Morris Jobke2018-06-011-2/+2
|\ \ | | | | | | 13.0.3 RC 1
| * | 13.0.3 RC 1Morris Jobke2018-06-011-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #9712 from nextcloud/backport/9711/stable13Morris Jobke2018-06-012-0/+4
|\ \ | | | | | | [stable13] Fix the unit tests
| * | Fix the master unit testsRoeland Jago Douma2018-06-012-0/+4
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9610 from ↵Morris Jobke2018-06-011-0/+67
|\ \ | | | | | | | | | | | | nextcloud/bugfix-stable13/3830/invitations_for_shared_calendars [stable13] send invitations for shared calendars
| * | send invitations for shared calendarsGeorg Ehrke2018-05-251-0/+67
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 16:50:06 +0000