From eec6be76653ab50813f7c12131a2bfbf2a5082c3 Mon Sep 17 00:00:00 2001
From: Xavier Dutreilh
Date: Thu, 12 Jun 2014 10:04:07 +0200
Subject: [PATCH 01/16] Add main entry to bower.json
---
bower.json | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bower.json b/bower.json
index 011cb82..98e35ea 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,9 @@
{
"name": "select2-bootstrap-css",
"version": "1.2.3",
+ "main": [
+ "select2-bootstrap.css"
+ ],
"ignore": [
"**/.*",
"node_modules",
From 31dddb66f2700453962b2efc279e8e014fe4ec0f Mon Sep 17 00:00:00 2001
From: Xavier Dutreilh
Date: Thu, 12 Jun 2014 10:04:20 +0200
Subject: [PATCH 02/16] Add select2 dependency to bower.json
---
bower.json | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bower.json b/bower.json
index 98e35ea..d37db20 100644
--- a/bower.json
+++ b/bower.json
@@ -9,6 +9,9 @@
"node_modules",
"components"
],
+ "dependencies": {
+ "select2": "^3.3.2"
+ },
"devDependencies": {
"bootstrap": "~2.3.1",
"sass-bootstrap": "git://github.com/jlong/sass-twitter-bootstrap.git#~2.3.1"
From 6f1570a0c2d1cc89318fac188d51fbd60aeea9a1 Mon Sep 17 00:00:00 2001
From: tom
Date: Thu, 12 Jun 2014 19:39:51 -0400
Subject: [PATCH 03/16] release 1.2.4
---
bower.json | 2 +-
lib/select2-bootstrap/version.rb | 2 +-
package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/bower.json b/bower.json
index d37db20..2e598a6 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "select2-bootstrap-css",
- "version": "1.2.3",
+ "version": "1.2.4",
"main": [
"select2-bootstrap.css"
],
diff --git a/lib/select2-bootstrap/version.rb b/lib/select2-bootstrap/version.rb
index 7187013..8a1a1b6 100644
--- a/lib/select2-bootstrap/version.rb
+++ b/lib/select2-bootstrap/version.rb
@@ -2,7 +2,7 @@ module Select2
module Bootstrap
# This is updated via the `grunt bump` command, which has a pretty
# unflexible matching syntax.
- VERSION_STRING = "'version': '1.2.3'"
+ VERSION_STRING = "'version': '1.2.4'"
# Then, just the version.
VERSION = VERSION_STRING.match(/\d+\.\d+\.\d+/)[0]
end
diff --git a/package.json b/package.json
index e19a6c2..0460ec7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "select2-bootstrap-css",
- "version": "1.2.3",
+ "version": "1.2.4",
"description": "simple css to make select2 widgets fit in with bootstrap",
"main": "",
"directories": {
From 2677fd37412f2c56a2be3731dea1596a454d6f40 Mon Sep 17 00:00:00 2001
From: Florian Kissling
Date: Wed, 13 Aug 2014 18:10:36 +0200
Subject: [PATCH 04/16] Remove protocols for jQuery, Select2 and Bootstrap
sources in gh-pages files. Fixes #43
---
_jekyll/_layouts/default.html | 10 +++++-----
_jekyll/_layouts/minimal.html | 10 +++++-----
docs/3.3.2.html | 10 +++++-----
docs/3.4.1.html | 10 +++++-----
docs/index.html | 10 +++++-----
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/_jekyll/_layouts/default.html b/_jekyll/_layouts/default.html
index 77abfa0..2073c99 100644
--- a/_jekyll/_layouts/default.html
+++ b/_jekyll/_layouts/default.html
@@ -2,10 +2,10 @@
-
-
-
-
+
+
+
+
@@ -191,4 +191,4 @@ Select2 version {{ page.version }}
});
-
\ No newline at end of file
+