aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2016-09-20 13:16:21 +0000
committerGerrit Code Review <gerrit@open-o.org>2016-09-20 13:16:21 +0000
commit097999d1d822baa5eab687d259214871e5552b25 (patch)
tree7beac9ca1b196c7bc1a7453531d940e2dd5a77bc
parentc128bef912a40a06fb73e2452dad9b8b8ab19640 (diff)
parentd04dcba9bf058d6968d9e61031b1058cbb54698a (diff)
Merge "add thirdparty bootstrap-table"
-rw-r--r--openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-table/bootstrap-table.css12
-rw-r--r--openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-table/bootstrap-table.js12
2 files changed, 12 insertions, 12 deletions
diff --git a/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-table/bootstrap-table.css b/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-table/bootstrap-table.css
index 4c41a4e6..0b65a73a 100644
--- a/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-table/bootstrap-table.css
+++ b/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-table/bootstrap-table.css
@@ -1,9 +1,9 @@
-/**
- * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.11.0
- * https://github.com/wenzhixin/bootstrap-table/
- */
-
+/*
+* bootstrap-table - v1.11.0 - 2016-07-02
+* https://github.com/wenzhixin/bootstrap-table
+* Copyright (c) 2016 zhixin wen
+* Licensed MIT License
+*/
.bootstrap-table .table {
margin-bottom: 0 !important;
border-bottom: 1px solid #dddddd;
diff --git a/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-table/bootstrap-table.js b/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-table/bootstrap-table.js
index a3122854..e44b6716 100644
--- a/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-table/bootstrap-table.js
+++ b/openo-portal/portal-common/src/main/webapp/common/thirdparty/bootstrap-table/bootstrap-table.js
@@ -1,9 +1,9 @@
-/**
- * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.11.1
- * https://github.com/wenzhixin/bootstrap-table/
- */
-
+/*
+* bootstrap-table - v1.11.0 - 2016-07-02
+* https://github.com/wenzhixin/bootstrap-table
+* Copyright (c) 2016 zhixin wen
+* Licensed MIT License
+*/
(function ($) {
'use strict';