Update version to 1.1.5.

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Changelog
 
+### 1.1.5
+
+* Fix the bottom border bug on Chrome.
+* Add horizontal scroll for support.
+* Fix scroll header width error.
+* Add ```showRefresh``` and ```showToggle``` options.
+
 ### 1.1.4
 
 * Fix ```destroy``` method bug.

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>215</td>
+<td>230</td>
 <tr>
 <tr>
 <td><img src="https://avatars.githubusercontent.com/u/6866443?v=2" width="32" height="32"> janborup</td>
@@ -33,6 +33,13 @@ 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><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>1</td>
+<tr>
+<tr>
 <td><img src="https://avatars.githubusercontent.com/u/385731?v=2" width="32" height="32"> wodka</td>
 <td><a href="https://github.com/wodka">wodka</a></td>
 <td>Vienna</td>
@@ -40,20 +47,20 @@ 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/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>Serbia, Europe</td>
 <td><a href="http://dadizajn.net">http://dadizajn.net</a></td>
 <td>1</td>
 <tr>
+<tr>
+<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>
 
 </table>
 
-Update date: 2014-08-14, created with https://github.com/wenzhixin/github-contributors
+Update date: 2014-08-18, created with https://github.com/wenzhixin/github-contributors

bootstrap-table.jquery.json

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

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

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.1.4 - 2014-08-15
+* bootstrap-table - v1.1.5 - 2014-08-18
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

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

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.1.4 - 2014-08-15
+* bootstrap-table - v1.1.5 - 2014-08-18
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

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

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.1.4 - 2014-08-15
+* bootstrap-table - v1.1.5 - 2014-08-18
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

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

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.1.4 - 2014-08-15
+* bootstrap-table - v1.1.5 - 2014-08-18
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

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

@@ -1,5 +1,5 @@
 /*
-* bootstrap-table - v1.1.4 - 2014-08-15
+* bootstrap-table - v1.1.5 - 2014-08-18
 * https://github.com/wenzhixin/bootstrap-table
 * Copyright (c) 2014 zhixin wen
 * Licensed MIT License

docs/documentation.html

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

docs/examples.html

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

docs/getting-started.html

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

src/bootstrap-table.js

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