Update version to 1.2.0.

wenzhixin · wenzhixin · commit 13277641fae0 · 2014-08-27T09:57:31.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
-## Changelog
+## ChangeLog
+
+### 1.2.0
+
+* Fix bootstrap 2 table border bug.
+* Fix loading and not found record display bug.
+* Update ```minimunCountColumns``` option to ```minimumCountColumns```.
+* Fix sort order bug.
 
 ### 1.1.5
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -16,7 +16,7 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td><a href="https://github.com/wenzhixin">wenzhixin</a></td>
 <td>Guangzhou, China</td>
 <td><a href="http://wenzhixin.net.cn">http://wenzhixin.net.cn</a></td>
-<td>230</td>
+<td>244</td>
 <tr>
 <tr>
 <td><img src="https://avatars.githubusercontent.com/u/6866443?v=2" width="32" height="32"> janborup</td>
@@ -33,10 +33,17 @@ bootstrap-table is due to the excellent work of the following contributors:
 <td>1</td>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/59292?v=2" width="32" height="32"> <a href="mailto:niknyby@riseup.net">Nik Nyby</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/5487021?v=2" width="32" height="32"> Julien Bisconti</td>
+<td><a href="https://github.com/veggiemonk">veggiemonk</a></td>
+<td>Belgium</td>
+<td><a href="https://twitter.com/veggiemonk">https://twitter.com/veggiemonk</a></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/59292?v=2" width="32" height="32"> nikolas</td>
 <td><a href="https://github.com/nikolas">nikolas</a></td>
-<td>NYC</td>
-<td><a href="http://nikolas.us.to/~nik/">http://nikolas.us.to/~nik/</a></td>
+<td></td>
+<td><a href="http://nikolas.us.to/">http://nikolas.us.to/</a></td>
 <td>1</td>
 <tr>
 <tr>
@@ -63,4 +70,4 @@ bootstrap-table is due to the excellent work of the following contributors:
 
 </table>
 
-Update date: 2014-08-18, created with https://github.com/wenzhixin/github-contributors
+Update date: 2014-08-27, created with https://github.com/wenzhixin/github-contributors
diff --git a/bootstrap-table.jquery.json b/bootstrap-table.jquery.json
@@ -1,6 +1,6 @@
 {
     "name": "bootstrap-table",
-    "version": "1.1.5",
+    "version": "1.2.0",
     "title": "Bootstrap Table",
     "description": "Bootstrap table displays data in a tabular format and offers rich support to radio, checkbox, sort, pagination and so on.",
     "author": {
diff --git a/dist/bootstrap-table.min.css b/dist/bootstrap-table.min.css
diff --git a/dist/bootstrap-table.min.js b/dist/bootstrap-table.min.js
diff --git a/dist/locale/bootstrap-table-da-DK.min.js b/dist/locale/bootstrap-table-da-DK.min.js
@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.1.5 - 2014-08-18
+* bootstrap-table - v1.2.0 - 2014-08-27
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
diff --git a/dist/locale/bootstrap-table-en.min.js b/dist/locale/bootstrap-table-en.min.js
@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.1.5 - 2014-08-18
+* bootstrap-table - v1.2.0 - 2014-08-27
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
diff --git a/dist/locale/bootstrap-table-pt-BR.min.js b/dist/locale/bootstrap-table-pt-BR.min.js
@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.1.5 - 2014-08-18
+* bootstrap-table - v1.2.0 - 2014-08-27
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
diff --git a/dist/locale/bootstrap-table-zh-CN.min.js b/dist/locale/bootstrap-table-zh-CN.min.js
@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.1.5 - 2014-08-18
+* bootstrap-table - v1.2.0 - 2014-08-27
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
diff --git a/dist/locale/bootstrap-table-zh-TW.min.js b/dist/locale/bootstrap-table-zh-TW.min.js
@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.1.5 - 2014-08-18
+* bootstrap-table - v1.2.0 - 2014-08-27
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License
diff --git a/docs/documentation.html b/docs/documentation.html
@@ -127,7 +127,7 @@ <h1 id="localizations" data-zh="国际化">
     <div class="container">
         <p>Copyright © 2012-2014, Bootstrap Table is licensed under the The MIT License. Coded by wenzhixin. </p>
         <ul class="footer-links">
-            <li>Currently: v1.1.5</li>
+            <li>Currently: v1.2.0</li>
             <li class="muted">·</li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li class="muted">·</li>
diff --git a/docs/examples.html b/docs/examples.html
@@ -983,7 +983,7 @@ <h1 id="via-javascript-table" data-zh="通过JavaScript启用">Via JavaScript</h
     <div class="container">
         <p>Copyright © 2012-2014, Bootstrap Table is licensed under the The MIT License. Coded by wenzhixin. </p>
         <ul class="footer-links">
-            <li>Currently: v1.1.5</li>
+            <li>Currently: v1.2.0</li>
             <li class="muted">·</li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li class="muted">·</li>
diff --git a/docs/getting-started.html b/docs/getting-started.html
@@ -132,7 +132,7 @@ <h2 id="options" data-zh="属性">Options</h2>
     <div class="container">
         <p>Copyright © 2012-2014, Bootstrap Table is licensed under the The MIT License. Coded by wenzhixin. </p>
         <ul class="footer-links">
-            <li>Currently: v1.1.5</li>
+            <li>Currently: v1.2.0</li>
             <li class="muted">·</li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li class="muted">·</li>
diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.1.5
+ * version: 1.2.0
  * https://github.com/wenzhixin/bootstrap-table/
  */
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bootstrap-table",`
`3`		`- "version": "1.1.5",`
	`3`	`+ "version": "1.2.0",`
`4`	`4`	`"title": "Bootstrap Table",`
`5`	`5`	`"description": "Bootstrap table displays data in a tabular format and offers rich support to radio, checkbox, sort, pagination and so on.",`
`6`	`6`	`"author": {`