catch up to master.
This commit is contained in:
parent
c7f46f0ea7
commit
c9256ec571
@ -249,7 +249,7 @@ $("#e10_3").select2({
|
||||
</a>
|
||||
<div class="nav-collapse">
|
||||
<ul class="nav">
|
||||
<li class="active"><a href="index.html">Select2 Latest</a></li>
|
||||
<li class="active"><a href="index.html">Select2 2.0</a></li>
|
||||
<li><a href="select2-1.0.html">Select2 1.0</a></li>
|
||||
</ul>
|
||||
</div><!--/.nav-collapse -->
|
||||
@ -274,6 +274,7 @@ $("#e10_3").select2({
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!--
|
||||
<div class="row">
|
||||
<div class="span12">
|
||||
<div class="alert alert-block alert-error">
|
||||
@ -284,6 +285,7 @@ $("#e10_3").select2({
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
-->
|
||||
|
||||
<header class="jumbotron subhead">
|
||||
<div class="subnav">
|
||||
@ -314,10 +316,11 @@ $("#e10_3").select2({
|
||||
</header>
|
||||
|
||||
<section id="changelog">
|
||||
<h2>Changelog</h2>
|
||||
<h2>Changelog from 1.0</h2>
|
||||
<div class="row"><div class="span12">
|
||||
<ul>
|
||||
<li>Support for selection of multiple values. See <code>multiple</code> option in the docs.</li>
|
||||
<li>Built-in tagging support. See the <strong>Tagging</strong> example.</li>
|
||||
<li>Ability to reset back to placeholder once a selection has been made. See <code>allowClear</code> option in the docs.</li>
|
||||
<li>Simplified paging of remote datasets by tracking the page number automatically.</li>
|
||||
<li>Minimum required jQuery version changed from 1.7+ to 1.4.2</li>
|
||||
|
@ -251,7 +251,7 @@ $("#e8_set").click(
|
||||
</a>
|
||||
<div class="nav-collapse">
|
||||
<ul class="nav">
|
||||
<li><a href="index.html">Select2 Latest</a></li>
|
||||
<li><a href="index.html">Select2 2.0</a></li>
|
||||
<li class="active"><a href="select2-1.0.html">Select2 1.0</a></li>
|
||||
</ul>
|
||||
</div><!--/.nav-collapse -->
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit e5f628b719508d32db80e9b36a8f8c6d36396c23
|
||||
Subproject commit d563764dfc7e401ac4f603ce47e300c1d8c3dfe6
|
Loading…
x
Reference in New Issue
Block a user