Migrate multiselect to user_ldap

This commit is contained in:
Morris Jobke 2014-11-06 15:48:34 +01:00
parent e0b797c43c
commit f39cb3fbc9
5 changed files with 23 additions and 3 deletions

View File

@ -2,6 +2,7 @@ filter:
excluded_paths: excluded_paths:
- '3rdparty/*' - '3rdparty/*'
- 'apps/*/3rdparty/*' - 'apps/*/3rdparty/*'
- 'apps/*/vendor/*'
- 'l10n/*' - 'l10n/*'
- 'core/l10n/*' - 'core/l10n/*'
- 'apps/*/l10n/*' - 'apps/*/l10n/*'
@ -13,7 +14,6 @@ filter:
- 'core/js/jquery-tipsy.js' - 'core/js/jquery-tipsy.js'
- 'core/js/jquery-ui-1.10.0.custom.js' - 'core/js/jquery-ui-1.10.0.custom.js'
- 'core/js/placeholders.js' - 'core/js/placeholders.js'
- 'core/js/jquery.multiselect.js'
imports: imports:

View File

@ -28,9 +28,9 @@ OC_Util::checkAdminUser();
OCP\Util::addScript('user_ldap', 'ldapFilter'); OCP\Util::addScript('user_ldap', 'ldapFilter');
OCP\Util::addScript('user_ldap', 'experiencedAdmin'); OCP\Util::addScript('user_ldap', 'experiencedAdmin');
OCP\Util::addScript('user_ldap', 'settings'); OCP\Util::addScript('user_ldap', 'settings');
OCP\Util::addScript('core', 'jquery.multiselect'); \OC_Util::addVendorScript('user_ldap', 'ui-multiselect/src/jquery.multiselect');
OCP\Util::addStyle('user_ldap', 'settings'); OCP\Util::addStyle('user_ldap', 'settings');
OCP\Util::addStyle('core', 'jquery.multiselect'); \OC_Util::addVendorStyle('user_ldap', 'ui-multiselect/jquery.multiselect');
OCP\Util::addStyle('core', 'jquery-ui-1.10.0.custom'); OCP\Util::addStyle('core', 'jquery-ui-1.10.0.custom');
// fill template // fill template

View File

@ -0,0 +1,20 @@
Copyright (c) 2011 Eric Hynds
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.