From 1db07d4cbdd6a0f0f25caece2bebabf578a3a9a9 Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Fri, 12 Feb 2016 13:31:24 +0100
Subject: [PATCH 1/4] Fix grammar in error message

---
 src/BootstrapTable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
index d924e0240..24f37d86b 100644
--- a/src/BootstrapTable.js
+++ b/src/BootstrapTable.js
@@ -64,7 +64,7 @@ class BootstrapTable extends React.Component {
 
     if (keyField == null)
       throw "Error. No any key column defined in TableHeaderColumn."+
-            "Use 'isKey={true}' to specify an unique column after version 0.5.4.";
+            "Use 'isKey={true}' to specify a unique column after version 0.5.4.";
 
     this.store.setProps({
       isPagination: props.pagination,

From d1a16bcda8b7159579522c7a2de5c4342689e34c Mon Sep 17 00:00:00 2001
From: jochenberger <fooberger@gmail.com>
Date: Fri, 12 Feb 2016 14:08:02 +0100
Subject: [PATCH 2/4] Fix typo

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b84a9cff7..a19204df3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-bootstrap-table",
   "version": "1.5.0",
-  "description": "It' a react table for bootstrap",
+  "description": "It's a react table for bootstrap",
   "main": "./dist/react-bootstrap-table.min.js",
   "repository": {
     "type": "git",

From 804bf33b30ca38121a6baace9b086ed143854fc6 Mon Sep 17 00:00:00 2001
From: dana <dana2208@users.noreply.github.com>
Date: Sun, 14 Feb 2016 15:57:02 +0200
Subject: [PATCH 3/4] Update extra-data-column-format-table.js

Remove unused code
---
 .../extra-data-column-format-table.js          | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/examples/js/column-format/extra-data-column-format-table.js b/examples/js/column-format/extra-data-column-format-table.js
index fc9e84770..68c3f6e88 100644
--- a/examples/js/column-format/extra-data-column-format-table.js
+++ b/examples/js/column-format/extra-data-column-format-table.js
@@ -9,11 +9,11 @@ var qualityType = {
     0: "good",
     1: "bad",
     2: "unknown"
-}
+};
 var inStockStatus = {
     1: "yes",
     2: "no"
-}
+};
 
 function addProducts(quantity) {
     var startId = products.length;
@@ -34,20 +34,10 @@ function enumFormatter(cell, row, enumObject){
     return enumObject[cell];
 }
 
-var cellEditProp = {
-    mode: "click",
-    blurToSave: true
-};
-
 export default class ExtraDataColumnFormatTable extends React.Component{
     render(){
-        var optionValues = [];
-        $.map(inStockStatus, function(value, index) {
-            optionValues.push(index);
-        });
-
         return (
-            <BootstrapTable data={products} cellEdit={cellEditProp} insertRow={true}>
+            <BootstrapTable data={products} >
                 <TableHeaderColumn dataField="id" isKey={true}>Product ID</TableHeaderColumn>
                 <TableHeaderColumn dataField="name">Product Name</TableHeaderColumn>
                 <TableHeaderColumn dataField="quality" dataFormat={enumFormatter} formatExtraData={qualityType}>Product Quality</TableHeaderColumn>
@@ -55,4 +45,4 @@ export default class ExtraDataColumnFormatTable extends React.Component{
             </BootstrapTable>
         );
     }
-};
\ No newline at end of file
+};

From f4032960bb137016aa956169d7000f728aabb61b Mon Sep 17 00:00:00 2001
From: homuler <eulerdora.1810.mann@gmail.com>
Date: Mon, 15 Feb 2016 13:22:06 +0900
Subject: [PATCH 4/4] check null value correctly.

---
 src/TableColumn.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/TableColumn.js b/src/TableColumn.js
index 17e44a198..788ef48bb 100644
--- a/src/TableColumn.js
+++ b/src/TableColumn.js
@@ -20,7 +20,7 @@ class TableColumn extends React.Component{
       return shouldUpdated;
     }
 
-    if(typeof children === 'object') {
+    if(typeof children === 'object' && children !== null) {
       if(children.props.type === 'checkbox' || children.props.type === 'radio') {
         shouldUpdated = shouldUpdated ||
           children.props.type !== nextProps.children.props.type ||