浏览代码

Update the version to 1.1.3

zhixin 11 年之前
父节点
当前提交
79e4ccc034
共有 8 个文件被更改,包括 26 次插入12 次删除
  1. 7 0
      CHANGELOG.md
  2. 13 6
      CONTRIBUTORS.md
  3. 1 1
      bootstrap-table.jquery.json
  4. 1 1
      bower.json
  5. 1 1
      docs/documentation.html
  6. 1 1
      docs/examples.html
  7. 1 1
      docs/getting-started.html
  8. 1 1
      src/bootstrap-table.js

+ 7 - 0
CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Changelog
 ## Changelog
 
 
+### 1.1.3
+
+* Add ```events``` column option.
+* Add ```checkboxHeader``` option.
+* Add ```queryParamsType``` option.
+* Fix ie class bug, and fix duplicated data error.
+
 ### 1.1.2
 ### 1.1.2
 
 
 * Add switchable column option.
 * Add switchable column option.

+ 13 - 6
CONTRIBUTORS.md

@@ -12,28 +12,35 @@ bootstrap-table is due to the excellent work of the following contributors:
 </tr>
 </tr>
 
 
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/2117018?v=1" width="32" height="32"> <a href="mailto:wenzhixin2010@gmail.com">文翼</a></td>
+<td><img src="https://avatars.githubusercontent.com/u/2117018?v=2" width="32" height="32"> <a href="mailto:wenzhixin2010@gmail.com">文翼</a></td>
 <td><a href="https://github.com/wenzhixin">wenzhixin</a></td>
 <td><a href="https://github.com/wenzhixin">wenzhixin</a></td>
 <td>Guangzhou, China</td>
 <td>Guangzhou, China</td>
 <td><a href="http://wenzhixin.net.cn">http://wenzhixin.net.cn</a></td>
 <td><a href="http://wenzhixin.net.cn">http://wenzhixin.net.cn</a></td>
-<td>180</td>
+<td>203</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/6866443?v=1" width="32" height="32"> janborup</td>
+<td><img src="https://avatars.githubusercontent.com/u/6866443?v=2" width="32" height="32"> janborup</td>
 <td><a href="https://github.com/janborup">janborup</a></td>
 <td><a href="https://github.com/janborup">janborup</a></td>
 <td></td>
 <td></td>
 <td></td>
 <td></td>
 <td>3</td>
 <td>3</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/1701102?v=1" width="32" height="32"> egcerqueira</td>
+<td><img src="https://avatars.githubusercontent.com/u/1701102?v=2" width="32" height="32"> egcerqueira</td>
 <td><a href="https://github.com/egcerqueira">egcerqueira</a></td>
 <td><a href="https://github.com/egcerqueira">egcerqueira</a></td>
 <td></td>
 <td></td>
 <td></td>
 <td></td>
 <td>1</td>
 <td>1</td>
 <tr>
 <tr>
 <tr>
 <tr>
-<td><img src="https://avatars.githubusercontent.com/u/1369261?v=1" width="32" height="32"> Tomislav Simić</td>
+<td><img src="https://avatars.githubusercontent.com/u/775601?v=2" width="32" height="32"> <a href="mailto:muzical84@hotmail.com">Janet</a></td>
+<td><a href="https://github.com/Muzical84">Muzical84</a></td>
+<td>Midwest</td>
+<td><a href="http://twitter.com/JesusFreak84">http://twitter.com/JesusFreak84</a></td>
+<td>1</td>
+<tr>
+<tr>
+<td><img src="https://avatars.githubusercontent.com/u/1369261?v=2" width="32" height="32"> Tomislav Simić</td>
 <td><a href="https://github.com/petougao">petougao</a></td>
 <td><a href="https://github.com/petougao">petougao</a></td>
 <td>Serbia, Europe</td>
 <td>Serbia, Europe</td>
 <td><a href="http://dadizajn.net">http://dadizajn.net</a></td>
 <td><a href="http://dadizajn.net">http://dadizajn.net</a></td>
@@ -42,4 +49,4 @@ bootstrap-table is due to the excellent work of the following contributors:
 
 
 </table>
 </table>
 
 
-Update date: 2014-07-30, created with https://github.com/wenzhixin/github-contributors
+Update date: 2014-08-07, created with https://github.com/wenzhixin/github-contributors

+ 1 - 1
bootstrap-table.jquery.json

@@ -1,6 +1,6 @@
 {
 {
     "name": "bootstrap-table",
     "name": "bootstrap-table",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "title": "Bootstrap Table",
     "title": "Bootstrap Table",
     "description": "Bootstrap table displays data in a tabular format and offers rich support to radio, checkbox, sort, pagination and so on.",
     "description": "Bootstrap table displays data in a tabular format and offers rich support to radio, checkbox, sort, pagination and so on.",
     "author": {
     "author": {

+ 1 - 1
bower.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "bootstrap-table",
   "name": "bootstrap-table",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "homepage": "https://github.com/wenzhixin/bootstrap-table",
   "homepage": "https://github.com/wenzhixin/bootstrap-table",
   "authors": [
   "authors": [
     "zhixin <wenzhixin2010@gmail.com>"
     "zhixin <wenzhixin2010@gmail.com>"

+ 1 - 1
docs/documentation.html

@@ -130,7 +130,7 @@
     <div class="container">
     <div class="container">
         <p>Copyright © 2012-2014, Bootstrap Table is licensed under the The MIT License. Coded by wenzhixin. </p>
         <p>Copyright © 2012-2014, Bootstrap Table is licensed under the The MIT License. Coded by wenzhixin. </p>
         <ul class="footer-links">
         <ul class="footer-links">
-            <li>Currently: v1.1.2</li>
+            <li>Currently: v1.1.3</li>
             <li class="muted">·</li>
             <li class="muted">·</li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li class="muted">·</li>
             <li class="muted">·</li>

+ 1 - 1
docs/examples.html

@@ -783,7 +783,7 @@
     <div class="container">
     <div class="container">
         <p>Copyright © 2012-2014, Bootstrap Table is licensed under the The MIT License. Coded by wenzhixin. </p>
         <p>Copyright © 2012-2014, Bootstrap Table is licensed under the The MIT License. Coded by wenzhixin. </p>
         <ul class="footer-links">
         <ul class="footer-links">
-            <li>Currently: v1.1.2</li>
+            <li>Currently: v1.1.3</li>
             <li class="muted">·</li>
             <li class="muted">·</li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li class="muted">·</li>
             <li class="muted">·</li>

+ 1 - 1
docs/getting-started.html

@@ -133,7 +133,7 @@
     <div class="container">
     <div class="container">
         <p>Copyright © 2012-2014, Bootstrap Table is licensed under the The MIT License. Coded by wenzhixin. </p>
         <p>Copyright © 2012-2014, Bootstrap Table is licensed under the The MIT License. Coded by wenzhixin. </p>
         <ul class="footer-links">
         <ul class="footer-links">
-            <li>Currently: v1.1.2</li>
+            <li>Currently: v1.1.3</li>
             <li class="muted">·</li>
             <li class="muted">·</li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li><a href="http://wenzhixin.net.cn">My website</a></li>
             <li class="muted">·</li>
             <li class="muted">·</li>

+ 1 - 1
src/bootstrap-table.js

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