From 896e0204752964f9163459586af40b198109abce Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 17:02:07 +0100
Subject: [PATCH 01/15] Update package.json

---
 package.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/package.json b/package.json
index 2e454c2b..e91b4804 100644
--- a/package.json
+++ b/package.json
@@ -39,5 +39,19 @@
   },
   "scripts": {
     "test": "grunt test"
+  },
+  "jspm": {
+    "main": "dist/query-builder",
+    "shim": {
+      "dist/query-builder": {
+        "deps": [
+          "jquery",
+          "bootstrap@^3.1.0",
+          "momentjs@^2.6.0",
+          "npm:microevent-mistic100@^2.1.0",
+          "github:jquery-extendext@^0.1.1"]
+      }
+    },
+    "files": ["dist/i18n"]
   }
 }

From c84d1394b4a0224a12f71d8fbaf63e0a78f02276 Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 17:14:11 +0100
Subject: [PATCH 02/15] Update package.json

working on jspm import
---
 package.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e91b4804..6a119c50 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,11 @@
   "scripts": {
     "test": "grunt test"
   },
+   "files": [
+    "dist",
+    "Gruntfile.js",
+    "LICENSE"
+  ],
   "jspm": {
     "main": "dist/query-builder",
     "shim": {
@@ -51,7 +56,6 @@
           "npm:microevent-mistic100@^2.1.0",
           "github:jquery-extendext@^0.1.1"]
       }
-    },
-    "files": ["dist/i18n"]
+    }
   }
 }

From 383e40e7f2e4573a71704cac83803eff78e5cec2 Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 17:25:57 +0100
Subject: [PATCH 03/15] Update package.json

deps not in jspm property
---
 package.json | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 6a119c50..471279dc 100644
--- a/package.json
+++ b/package.json
@@ -8,6 +8,13 @@
   },
   "description": "jQuery plugin for user friendly query/filter creator",
   "main": "dist/query-builder.js",
+  "dependencies": {
+    "jquery": "~1.11",
+    "bootstrap": "^3.1.0",
+    "momentjs": "^2.6.0",
+    "microevent-mistic100": "^2.1.0",
+    "jquery-extendext": "^0.1.1"
+  },
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-contrib-qunit": "~0.5.0",
@@ -45,17 +52,4 @@
     "Gruntfile.js",
     "LICENSE"
   ],
-  "jspm": {
-    "main": "dist/query-builder",
-    "shim": {
-      "dist/query-builder": {
-        "deps": [
-          "jquery",
-          "bootstrap@^3.1.0",
-          "momentjs@^2.6.0",
-          "npm:microevent-mistic100@^2.1.0",
-          "github:jquery-extendext@^0.1.1"]
-      }
-    }
-  }
 }

From f8382f820fde4cf1deaf501f367ea5b12cf861b5 Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 17:27:53 +0100
Subject: [PATCH 04/15] Update package.json

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

diff --git a/package.json b/package.json
index 471279dc..e7de6a94 100644
--- a/package.json
+++ b/package.json
@@ -51,5 +51,5 @@
     "dist",
     "Gruntfile.js",
     "LICENSE"
-  ],
+  ]
 }

From 9129f2d6778a0f5bc61e82799a2231b389ba36f2 Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 17:35:39 +0100
Subject: [PATCH 05/15] Update package.json

use jspm as registry
---
 package.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e7de6a94..2f7aa991 100644
--- a/package.json
+++ b/package.json
@@ -8,12 +8,13 @@
   },
   "description": "jQuery plugin for user friendly query/filter creator",
   "main": "dist/query-builder.js",
+  "registry": "jspm",
   "dependencies": {
     "jquery": "~1.11",
     "bootstrap": "^3.1.0",
     "momentjs": "^2.6.0",
-    "microevent-mistic100": "^2.1.0",
-    "jquery-extendext": "^0.1.1"
+    "npm:microevent-mistic100": "^2.1.0",
+    "github:jquery-extendext": "^0.1.1"
   },
   "devDependencies": {
     "grunt": "~0.4.5",

From bdf86eb2241ed590265b772eda34f38635bb114d Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 17:36:12 +0100
Subject: [PATCH 06/15] Update package.json

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

diff --git a/package.json b/package.json
index 2f7aa991..ffc431b6 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "jquery": "~1.11",
     "bootstrap": "^3.1.0",
-    "momentjs": "^2.6.0",
+    "moment": "^2.6.0",
     "npm:microevent-mistic100": "^2.1.0",
     "github:jquery-extendext": "^0.1.1"
   },

From 82431c23d69b595bde116694a56320984080ad1e Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 17:38:12 +0100
Subject: [PATCH 07/15] Update package.json

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

diff --git a/package.json b/package.json
index ffc431b6..343a2b83 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "bootstrap": "^3.1.0",
     "moment": "^2.6.0",
     "npm:microevent-mistic100": "^2.1.0",
-    "github:jquery-extendext": "^0.1.1"
+    "github:mistic100/jQuery.extendext": "^0.1.1"
   },
   "devDependencies": {
     "grunt": "~0.4.5",

From 05b045fb9c89a5673536e42441a0ad57026f8a4f Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 19:31:36 +0100
Subject: [PATCH 08/15] Update package.json

use standalone
---
 package.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 343a2b83..86d697e3 100644
--- a/package.json
+++ b/package.json
@@ -7,14 +7,12 @@
     "url": "http://www.strangeplanet.fr"
   },
   "description": "jQuery plugin for user friendly query/filter creator",
-  "main": "dist/query-builder.js",
+  "main": "dist/query-builder.standalone.js",
   "registry": "jspm",
   "dependencies": {
     "jquery": "~1.11",
     "bootstrap": "^3.1.0",
-    "moment": "^2.6.0",
-    "npm:microevent-mistic100": "^2.1.0",
-    "github:mistic100/jQuery.extendext": "^0.1.1"
+    "moment": "^2.6.0"
   },
   "devDependencies": {
     "grunt": "~0.4.5",

From be3e12041a3f9dbe126e642b527447ade40f29d0 Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 19:35:40 +0100
Subject: [PATCH 09/15] Update package.json

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

diff --git a/package.json b/package.json
index 86d697e3..012bea2b 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "url": "http://www.strangeplanet.fr"
   },
   "description": "jQuery plugin for user friendly query/filter creator",
-  "main": "dist/query-builder.standalone.js",
+  "main": "dist/query-builder.standalone",
   "registry": "jspm",
   "dependencies": {
     "jquery": "~1.11",

From 9285b376deed6ab347b71734effd5a0cc516cd2b Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 19:40:04 +0100
Subject: [PATCH 10/15] Update package.json

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

diff --git a/package.json b/package.json
index 012bea2b..d72f8693 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "url": "http://www.strangeplanet.fr"
   },
   "description": "jQuery plugin for user friendly query/filter creator",
-  "main": "dist/query-builder.standalone",
+  "main": "dist/query-builder",
   "registry": "jspm",
   "dependencies": {
     "jquery": "~1.11",

From 2b77aff422f105161b68efe4053300917d12fce4 Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 19:51:13 +0100
Subject: [PATCH 11/15] Update package.json

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d72f8693..08c9c124 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,9 @@
   "dependencies": {
     "jquery": "~1.11",
     "bootstrap": "^3.1.0",
-    "moment": "^2.6.0"
+    "moment": "^2.6.0",
+    "npm:microevent-mistic100": "^2.1.0",		
+    "github:mistic100/jQuery.extendext": "^0.1.1"
   },
   "devDependencies": {
     "grunt": "~0.4.5",

From b636909b3ab9ee2072d332a7c9eb7f831c7fbcd1 Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 19:53:14 +0100
Subject: [PATCH 12/15] Update query-builder.js

Temporary hack to get extendext in queyrBuilder
---
 dist/query-builder.js | 108 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 107 insertions(+), 1 deletion(-)

diff --git a/dist/query-builder.js b/dist/query-builder.js
index bc221f53..63ff0a0d 100644
--- a/dist/query-builder.js
+++ b/dist/query-builder.js
@@ -14,6 +14,112 @@
     }
 }(this, function($, MicroEvent) {
     "use strict";
+    
+    $.extendext = function() {
+    console.log("after extendext");
+    var options, name, src, copy, copyIsArray, clone,
+      target = arguments[0] || {},
+      i = 1,
+      length = arguments.length,
+      deep = false,
+      arrayMode = 'default';
+
+    // Handle a deep copy situation
+    if ( typeof target === "boolean" ) {
+      deep = target;
+
+      // Skip the boolean and the target
+      target = arguments[ i++ ] || {};
+    }
+
+    // Handle array mode parameter
+    if ( typeof target === "string" ) {
+      arrayMode = $([target.toLowerCase(), 'default']).filter(['default','concat','replace','extend'])[0];
+
+      // Skip the string param
+      target = arguments[ i++ ] || {};
+    }
+
+    // Handle case when target is a string or something (possible in deep copy)
+    if ( typeof target !== "object" && !$.isFunction(target) ) {
+      target = {};
+    }
+
+    // Extend jQuery itself if only one argument is passed
+    if ( i === length ) {
+      target = this;
+      i--;
+    }
+
+    for ( ; i < length; i++ ) {
+      // Only deal with non-null/undefined values
+      if ( (options = arguments[ i ]) !== null ) {
+        // Special operations for arrays
+        if ($.isArray(options) && arrayMode !== 'default') {
+          clone = target && $.isArray(target) ? target : [];
+
+          switch (arrayMode) {
+          case 'concat':
+            target = clone.concat( $.extend( deep, [], options ) );
+            break;
+
+          case 'replace':
+            target = $.extend( deep, [], options );
+            break;
+
+          case 'extend':
+            options.forEach(function(e, i) {
+              if (typeof e === 'object') {
+                var type = $.isArray(e) ? [] : {};
+                clone[i] = $.extendext( deep, arrayMode, clone[i] || type, e );
+
+              } else if (clone.indexOf(e) === -1) {
+                clone.push(e);
+              }
+            });
+
+            target = clone;
+            break;
+          }
+
+        } else {
+          // Extend the base object
+          for ( name in options ) {
+            src = target[ name ];
+            copy = options[ name ];
+
+            // Prevent never-ending loop
+            if ( target === copy ) {
+              continue;
+            }
+
+            // Recurse if we're merging plain objects or arrays
+            if ( deep && copy && ( $.isPlainObject(copy) ||
+              (copyIsArray = $.isArray(copy)) ) ) {
+
+              if ( copyIsArray ) {
+                copyIsArray = false;
+                clone = src && $.isArray(src) ? src : [];
+
+              } else {
+                clone = src && $.isPlainObject(src) ? src : {};
+              }
+
+              // Never move original objects, clone them
+              target[ name ] = $.extendext( deep, arrayMode, clone, copy );
+
+            // Don't bring in undefined values
+            } else if ( copy !== undefined ) {
+              target[ name ] = copy;
+            }
+          }
+        }
+      }
+    }
+
+    // Return the modified object
+    return target;
+  };
   
     var types = [
             'string',
@@ -2586,4 +2692,4 @@ $.fn.queryBuilder.defaults.set({
           .replace(/\t/g, '\\t')
           .replace(/\x1a/g, '\\Z');
     }
-}));
\ No newline at end of file
+}));

From 8801c2193d902088facffc25cd4956cac983b961 Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 19:53:49 +0100
Subject: [PATCH 13/15] Update package.json

life without extendext dep
---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 08c9c124..18426955 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,7 @@
     "jquery": "~1.11",
     "bootstrap": "^3.1.0",
     "moment": "^2.6.0",
-    "npm:microevent-mistic100": "^2.1.0",		
-    "github:mistic100/jQuery.extendext": "^0.1.1"
+    "npm:microevent-mistic100": "^2.1.0"
   },
   "devDependencies": {
     "grunt": "~0.4.5",

From 73b55a48b246770f2fd50f752046b53a2c015af3 Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Thu, 19 Mar 2015 19:59:12 +0100
Subject: [PATCH 14/15] Update query-builder.js

---
 dist/query-builder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/query-builder.js b/dist/query-builder.js
index 63ff0a0d..5951008d 100644
--- a/dist/query-builder.js
+++ b/dist/query-builder.js
@@ -7,7 +7,7 @@
 // Modules: bt-selectpicker, bt-tooltip-errors, filter-description, loopback-support, mongodb-support, sortable, sql-support
 (function(root, factory) {
     if (typeof define === 'function' && define.amd) {
-        define(['jquery', 'microevent', 'jQuery.extendext'], factory);
+        define(['jquery', 'microevent'], factory);
     }
     else {
         factory(root.jQuery, root.MicroEvent);

From b410908a126f25c6f37d4c5ae5008e779b37e615 Mon Sep 17 00:00:00 2001
From: "EBTC.Online" <th@ebtc-online.org>
Date: Fri, 20 Mar 2015 11:49:04 +0100
Subject: [PATCH 15/15] Update query-builder.js

remove debug info
---
 dist/query-builder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/query-builder.js b/dist/query-builder.js
index 5951008d..4973a8db 100644
--- a/dist/query-builder.js
+++ b/dist/query-builder.js
@@ -16,7 +16,7 @@
     "use strict";
     
     $.extendext = function() {
-    console.log("after extendext");
+
     var options, name, src, copy, copyIsArray, clone,
       target = arguments[0] || {},
       i = 1,