Skip to content

Commit

Permalink
Preparing release 0.9.15 and trying to get Travis running again.
Browse files Browse the repository at this point in the history
  • Loading branch information
davidstutz committed Mar 3, 2018
1 parent 1504c6e commit 1f50214
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 17 deletions.
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Apache License, Version 2.0:

Copyright (c) 2012 - 2017 David Stutz
Copyright (c) 2012 - 2018 David Stutz

Licensed under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the License. You may obtain a copy of the
Expand All @@ -13,7 +13,7 @@ specific language governing permissions and limitations under the License.

BSD 3-Clause License:

Copyright (c) 2012 - 2017 David Stutz
Copyright (c) 2012 - 2018 David Stutz
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ Also check out [Bootstrap Strength Meter](https://github.com/davidstutz/bootstra

**Apache License, Version 2.0**

Copyright (c) 2012 - 2017 [David Stutz](http://davidstutz.de/)
Copyright (c) 2012 - 2018 [David Stutz](http://davidstutz.de/)

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

**BSD 3-Clause License**

Copyright (c) 2012 - 2017 [David Stutz](http://davidstutz.de/)
Copyright (c) 2012 - 2018 [David Stutz](http://davidstutz.de/)
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
5 changes: 2 additions & 3 deletions dist/js/bootstrap-multiselect.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Bootstrap Multiselect (http://davidstutz.de/bootstrap-multiselect/)
*
* Apache License, Version 2.0:
* Copyright (c) 2012 - 2017 David Stutz
* Copyright (c) 2012 - 2018 David Stutz
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a
Expand All @@ -15,7 +15,7 @@
* under the License.
*
* BSD 3-Clause License:
* Copyright (c) 2012 - 2017 David Stutz
* Copyright (c) 2012 - 2018 David Stutz
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -998,7 +998,6 @@
}

$('a', $resetButton).click($.proxy(function(){
console.log('test')
this.clearSelection();
}, this));

Expand Down
4 changes: 2 additions & 2 deletions dist/less/bootstrap-multiselect.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Bootstrap Multiselect (http://davidstutz.de/bootstrap-multiselect/)
*
* Apache License, Version 2.0:
* Copyright (c) 2012 - 2017 David Stutz
* Copyright (c) 2012 - 2018 David Stutz
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a
Expand All @@ -15,7 +15,7 @@
* under the License.
*
* BSD 3-Clause License:
* Copyright (c) 2012 - 2017 David Stutz
* Copyright (c) 2012 - 2018 David Stutz
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
19 changes: 16 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,19 @@
window.prettyPrint() && prettyPrint();
});
</script>
<script type="text/javascript">
var _paq = _paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//davidstutz.de/piwik/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', '1']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
</head>
<body data-spy="scroll" data-target="#affix">
<a href="https://github.com/davidstutz/bootstrap-multiselect"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub"></a>
Expand Down Expand Up @@ -6876,7 +6889,7 @@ <h2 id="license">License</h2>
<dl>
<dt>Apache License, Version 2.0</dt>
<dd>
<p>Copyright 2012 - 2017 <a href="http://davidstutz.de/">David Stutz</a></p>
<p>Copyright 2012 - 2018 <a href="http://davidstutz.de/">David Stutz</a></p>
<p>
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">http://www.apache.org/licenses/LICENSE-2.0</a>.
</p>
Expand All @@ -6887,7 +6900,7 @@ <h2 id="license">License</h2>

<dt>BSD 3-Clause License</dt>
<dd>
<p>Copyright (c) 2012 - 2017 <a href="http://davidstutz.de/">David Stutz</a></p>
<p>Copyright (c) 2012 - 2018 <a href="http://davidstutz.de/">David Stutz</a></p>
<p>All rights reserved.</p>
<p>
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand All @@ -6905,7 +6918,7 @@ <h2 id="license">License</h2>

<hr>
<p>
&copy; 2012 - 2017
&copy; 2012 - 2018
<a href="http://davidstutz.de">David Stutz</a> - dual licensed: <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v2.0</a>, <a href="http://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause License</a>
</p>
</div>
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-multiselect",
"version": "0.9.13",
"version": "0.9.15",
"description": "JQuery multiselect plugin based on Twitter Bootstrap.",
"main": "dist/js/bootstrap-multiselect.js",
"directories": {
Expand Down Expand Up @@ -32,13 +32,12 @@
"jquery": "~2.1.3"
},
"devDependencies": {
"@types/jquery": "^3.2.12",
"jasmine-core": "*",
"karma": "*",
"karma-chrome-launcher": "*",
"karma-cli": "*",
"karma-jasmine": "*",
"karma-phantomjs-launcher": "*"
"karma-phantomjs-launcher": "*",
"karma-chrome-launcher": "*"
},
"types": "./types/index.d.ts"
}
2 changes: 1 addition & 1 deletion require.html
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ <h3>Call the Plugin</h3>

<hr>
<p>
&copy; 2012 - 2017
&copy; 2012 - 2018
<a href="http://davidstutz.de">David Stutz</a> - dual licensed: <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v2.0</a>, <a href="http://opensource.org/licenses/BSD-3-Clause">BSD 3-Clause License</a>
</p>
</div>
Expand Down

0 comments on commit 1f50214

Please sign in to comment.