From 1ed3be4f66ace052174985f79248b001e54a8809 Mon Sep 17 00:00:00 2001
From: Thomas Bonk <tbo@cybo.biz>
Date: Fri, 25 Sep 2015 17:08:15 +0200
Subject: [PATCH 1/2] Fixed "window is undefined" bug

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 31072a36a..050a627e5 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -8,7 +8,7 @@ var TableHeaderColumn = _interopRequire(require("./TableHeaderColumn"));
 
 var TableDataSet = require("./store/TableDataStore").TableDataSet;
 
-if (window) {
+if (typeof window !== 'undefined') {
   window.BootstrapTable = BootstrapTable;
   window.TableHeaderColumn = TableHeaderColumn;
 }
@@ -16,4 +16,4 @@ module.exports = {
   BootstrapTable: BootstrapTable,
   TableHeaderColumn: TableHeaderColumn,
   TableDataSet: TableDataSet
-};
\ No newline at end of file
+};

From 0cc7d0b70e39501fd581e32fa598a26a913070be Mon Sep 17 00:00:00 2001
From: smartameer <pradeeppatro16@gmail.com>
Date: Thu, 1 Oct 2015 00:14:22 +0530
Subject: [PATCH 2/2] Adding Table with borderless feature

---
 css/react-bootstrap-table.css     | 7 +++----
 css/react-bootstrap-table.min.css | 2 +-
 src/BootstrapTable.js             | 6 +++++-
 src/TableBody.js                  | 4 +++-
 src/TableHeader.js                | 8 ++++++--
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/css/react-bootstrap-table.css b/css/react-bootstrap-table.css
index 625fc544c..20a215e91 100644
--- a/css/react-bootstrap-table.css
+++ b/css/react-bootstrap-table.css
@@ -3,17 +3,16 @@
 }
 .react-bs-table .table-header{
   height: 37px;
-  border-right-width: 1px;
-  border-right-style: solid;
-  border-right-color: rgb(221, 221, 221);
   border-top-width: 1px;
   border-top-style: solid;
   border-top-color: rgb(221, 221, 221);
+  border-bottom-width: 1px;
+  border-bottom-style: solid;
+  border-bottom-color: rgb(221, 221, 221);
 }
 
 .react-bs-table .table-header > table{
   table-layout: fixed;
-  border-right-style: hidden;
   border-top-style: hidden;
 }
 
diff --git a/css/react-bootstrap-table.min.css b/css/react-bootstrap-table.min.css
index e44e4cd75..751720256 100644
--- a/css/react-bootstrap-table.min.css
+++ b/css/react-bootstrap-table.min.css
@@ -1 +1 @@
-.react-bs-table{margin-bottom:37px}.react-bs-table .table-header{height:37px;border-right-width:1px;border-right-style:solid;border-right-color:#ddd;border-top-width:1px;border-top-style:solid;border-top-color:#ddd}.react-bs-table .table-header>table{table-layout:fixed;border-right-style:hidden;border-top-style:hidden}.react-bs-table .table-header>table>thead>tr{border-bottom-style:hidden}.react-bs-table .table-header>table>thead>tr>th .table-header-column{line-height:25px}.react-bs-table .table-header>table>thead>tr>.sort-column{cursor:pointer}.react-bs-table .table-container{overflow-x:auto;overflow-y:auto;height:100%}.react-bs-table .table-container>table{margin-top:-18px;table-layout:fixed;margin-bottom:0}.react-bs-container .tool-bar{margin-bottom:5px}
\ No newline at end of file
+.react-bs-table{margin-bottom:37px}.react-bs-table .table-header{height:37px;border-top-width:1px;border-top-style:solid;border-top-color:#ddd;border-bottom-width:1px;border-bottom-style:solid;border-bottom-color:#ddd}.react-bs-table .table-header>table{table-layout:fixed;border-top-style:hidden}.react-bs-table .table-header>table>thead>tr{border-bottom-style:hidden}.react-bs-table .table-header>table>thead>tr>th .table-header-column{line-height:25px}.react-bs-table .table-header>table>thead>tr>.sort-column{cursor:pointer}.react-bs-table .table-container{overflow-x:auto;overflow-y:auto;height:100%}.react-bs-table .table-container>table{margin-top:-18px;table-layout:fixed;margin-bottom:0}.react-bs-container .tool-bar{margin-bottom:5px}
\ No newline at end of file
diff --git a/src/BootstrapTable.js b/src/BootstrapTable.js
index 015bf8282..e9f601016 100644
--- a/src/BootstrapTable.js
+++ b/src/BootstrapTable.js
@@ -129,11 +129,13 @@ class BootstrapTable extends React.Component{
                        sortName={this.props.options.sortName}
                        sortOrder={this.props.options.sortOrder}
                        onSort={this.handleSort.bind(this)}
-                       onSelectAllRow={this.handleSelectAllRow.bind(this)}>
+                       onSelectAllRow={this.handleSelectAllRow.bind(this)}
+                       bordered={this.props.bordered}>
             {this.props.children}
           </TableHeader>
           <TableBody ref="body" data={this.state.data} columns={columns}
             striped={this.props.striped}
+            bordered={this.props.bordered}
             hover={this.props.hover}
             keyField={this.store.getKeyField()}
             condensed={this.props.condensed}
@@ -376,6 +378,7 @@ BootstrapTable.propTypes = {
   height: React.PropTypes.string,
   data: React.PropTypes.array,
   striped: React.PropTypes.bool,
+  bordered: React.PropTypes.bool,
   hover: React.PropTypes.bool,
   condensed: React.PropTypes.bool,
   pagination: React.PropTypes.bool,
@@ -410,6 +413,7 @@ BootstrapTable.propTypes = {
 BootstrapTable.defaultProps = {
   height: "100%",
   striped: false,
+  bordered: true,
   hover: false,
   condensed: false,
   pagination: false,
diff --git a/src/TableBody.js b/src/TableBody.js
index b50e5c2a4..1ec6467ed 100644
--- a/src/TableBody.js
+++ b/src/TableBody.js
@@ -18,8 +18,9 @@ class TableBody extends React.Component{
   render(){
     var containerClasses = classSet("table-container");
 
-    var tableClasses = classSet("table", "table-bordered", {
+    var tableClasses = classSet("table", {
       'table-striped': this.props.striped,
+      'table-bordered': this.props.bordered,
       'table-hover': this.props.hover,
       'table-condensed': this.props.condensed
     });
@@ -200,6 +201,7 @@ TableBody.propTypes = {
   data: React.PropTypes.array,
   columns: React.PropTypes.array,
   striped: React.PropTypes.bool,
+  bordered: React.PropTypes.bool,
   hover: React.PropTypes.bool,
   condensed: React.PropTypes.bool,
   keyField: React.PropTypes.string,
diff --git a/src/TableHeader.js b/src/TableHeader.js
index 0decd33d9..4c8857397 100644
--- a/src/TableHeader.js
+++ b/src/TableHeader.js
@@ -38,12 +38,15 @@ class TableHeader extends React.Component{
 
   render(){
     var containerClasses = classSet("table-header");
+    var tableClasses = classSet("table", "table-hover", {
+        "table-bordered": this.props.bordered
+    });
     var selectRowHeaderCol = this.props.hideSelectColumn?null:this.renderSelectRowHeader();
     this._attachClearSortCaretFunc();
 
     return(
       <div className={containerClasses}>
-        <table className="table table-hover table-bordered">
+        <table className={tableClasses}>
           <thead>
             <tr ref="header">
               {selectRowHeaderCol}
@@ -83,7 +86,8 @@ TableHeader.propTypes = {
   onSelectAllRow: React.PropTypes.func,
   sortName: React.PropTypes.string,
   sortOrder: React.PropTypes.string,
-  hideSelectColumn: React.PropTypes.bool
+  hideSelectColumn: React.PropTypes.bool,
+  bordered: React.PropTypes.bool
 };
 
 TableHeader.defaultProps = {