Browse Source

Update version to 1.2.1.

zhixin 11 years ago
parent
commit
c64cfbcede

+ 8 - 0
CHANGELOG.md

@@ -1,5 +1,13 @@
 ## ChangeLog
 
+### 1.2.1
+
+* Fix [#56](https://github.com/wenzhixin/bootstrap-table/issues/56): Pagination issue in bootstrap 2.3.
+* Fix [#76](https://github.com/wenzhixin/bootstrap-table/issues/76): After refreshing table data, search no longer works.
+* Fix [#77](https://github.com/wenzhixin/bootstrap-table/issues/77): After searching and then clearing the search field, table is no longer sortable.
+* Add `sortable` option, `false` to disable sortable of all columns.
+* Support localization for docs.
+
 ### 1.2.0
 
 * Fix bootstrap 2 table border bug.

+ 2 - 2
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>244</td>
+<td>258</td>
 <tr>
 <tr>
 <td><img src="https://avatars.githubusercontent.com/u/6866443?v=2" width="32" height="32"> janborup</td>
@@ -70,4 +70,4 @@ bootstrap-table is due to the excellent work of the following contributors:
 
 </table>
 
-Update date: 2014-08-27, created with https://github.com/wenzhixin/github-contributors
+Update date: 2014-08-29, created with https://github.com/wenzhixin/github-contributors

+ 1 - 5
README.md

@@ -12,11 +12,7 @@ The table displays data in a tabular format and offers rich support to radio, ch
 
 ## Bugs & Enhancements (next version)
 
-- [x] Fix [#56](https://github.com/wenzhixin/bootstrap-table/issues/56): Pagination issue in bootstrap 2.3.
-- [x] Fix [#76](https://github.com/wenzhixin/bootstrap-table/issues/76): After refreshing table data, search no longer works.
-- [x] Fix [#77](https://github.com/wenzhixin/bootstrap-table/issues/77): After searching and then clearing the search field, table is no longer sortable.
-- [x] Add `sortable` option, `false` to disable sortable of all columns.
-- [x] Support localization for docs.
+
 
 ## Features
 

+ 1 - 1
bootstrap-table.jquery.json

@@ -1,6 +1,6 @@
 {
     "name": "bootstrap-table",
-    "version": "1.2.0",
+    "version": "1.2.1",
     "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": {

File diff suppressed because it is too large
+ 2 - 2
dist/bootstrap-table.min.css


File diff suppressed because it is too large
+ 2 - 2
dist/bootstrap-table.min.js


+ 1 - 1
dist/locale/bootstrap-table-da-DK.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.2.0 - 2014-08-27
+* bootstrap-table - v1.2.1 - 2014-08-29
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-en.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.2.0 - 2014-08-27
+* bootstrap-table - v1.2.1 - 2014-08-29
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-pt-BR.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.2.0 - 2014-08-27
+* bootstrap-table - v1.2.1 - 2014-08-29
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-zh-CN.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.2.0 - 2014-08-27
+* bootstrap-table - v1.2.1 - 2014-08-29
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

+ 1 - 1
dist/locale/bootstrap-table-zh-TW.min.js

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.2.0 - 2014-08-27
+* bootstrap-table - v1.2.1 - 2014-08-29
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

+ 1 - 1
docs/documentation.html

@@ -145,7 +145,7 @@
     <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.2.0</li>
+            <li>Currently: v1.2.1</li>
             <li class="muted">·</li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li class="muted">·</li>

+ 1 - 1
docs/examples.html

@@ -1001,7 +1001,7 @@
     <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.2.0</li>
+            <li>Currently: v1.2.1</li>
             <li class="muted">·</li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li class="muted">·</li>

+ 1 - 1
docs/getting-started.html

@@ -150,7 +150,7 @@
     <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.2.0</li>
+            <li>Currently: v1.2.1</li>
             <li class="muted">·</li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li class="muted">·</li>

+ 1 - 1
src/bootstrap-table.js

@@ -1,6 +1,6 @@
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.2.0
+ * version: 1.2.1
  * https://github.com/wenzhixin/bootstrap-table/
  */