Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
559b34e5
Commit
559b34e5
authored
Nov 13, 2014
by
blizzz
Browse files
Merge pull request #12005 from owncloud/bower-multiselect
Move multiselect to user_ldap
parents
5f8fb8d1
f39cb3fb
Changes
5
Hide whitespace changes
Inline
Side-by-side
.scrutinizer.yml
View file @
559b34e5
...
...
@@ -2,6 +2,7 @@ filter:
excluded_paths
:
-
'
3rdparty/*'
-
'
apps/*/3rdparty/*'
-
'
apps/*/vendor/*'
-
'
l10n/*'
-
'
core/l10n/*'
-
'
apps/*/l10n/*'
...
...
@@ -13,7 +14,6 @@ filter:
-
'
core/js/jquery-tipsy.js'
-
'
core/js/jquery-ui-1.10.0.custom.js'
-
'
core/js/placeholders.js'
-
'
core/js/jquery.multiselect.js'
imports
:
...
...
apps/user_ldap/settings.php
View file @
559b34e5
...
...
@@ -28,9 +28,9 @@ OC_Util::checkAdminUser();
OCP\Util
::
addScript
(
'user_ldap'
,
'ldapFilter'
);
OCP\Util
::
addScript
(
'user_ldap'
,
'experiencedAdmin'
);
OCP\Util
::
addScript
(
'user_ldap'
,
'settings'
);
OC
P\
Util
::
addScript
(
'
core'
,
'
jquery.multiselect'
);
\
OC
_
Util
::
add
Vendor
Script
(
'
user_ldap'
,
'ui-multiselect/src/
jquery.multiselect'
);
OCP\Util
::
addStyle
(
'user_ldap'
,
'settings'
);
OC
P\
Util
::
addStyle
(
'
core'
,
'
jquery.multiselect'
);
\
OC
_
Util
::
add
Vendor
Style
(
'
user_ldap'
,
'ui-multiselect/
jquery.multiselect'
);
OCP\Util
::
addStyle
(
'core'
,
'jquery-ui-1.10.0.custom'
);
// fill template
...
...
apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE
0 → 100644
View file @
559b34e5
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.
core/css
/jquery.multiselect.css
→
apps/user_ldap/vendor/ui-multiselect
/jquery.multiselect.css
View file @
559b34e5
File moved
core/js
/jquery.multiselect.js
→
apps/user_ldap/vendor/ui-multiselect/src
/jquery.multiselect.js
View file @
559b34e5
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment