From 8e8bc43f6e97a4b44762d658695a41b2d11fdb52 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Fri, 25 Oct 2013 10:14:03 +0200 Subject: [PATCH 01/10] typo --- package-overrides/github/firebase/angularFire@0.3.1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/github/firebase/angularFire@0.3.1.json b/package-overrides/github/firebase/angularFire@0.3.1.json index b875c82..6e9c674 100644 --- a/package-overrides/github/firebase/angularFire@0.3.1.json +++ b/package-overrides/github/firebase/angularFire@0.3.1.json @@ -1,5 +1,5 @@ { "dependencyShim": { - "angularfire": ["angular"] + "angularFire": ["angular"] } } From bd8e22c59809f6f38bc7d24e4fb466e9598a5ed1 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Fri, 25 Oct 2013 10:14:58 +0200 Subject: [PATCH 02/10] exact angular version --- package-overrides/github/firebase/angularFire@0.3.1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/github/firebase/angularFire@0.3.1.json b/package-overrides/github/firebase/angularFire@0.3.1.json index 6e9c674..0ac79f0 100644 --- a/package-overrides/github/firebase/angularFire@0.3.1.json +++ b/package-overrides/github/firebase/angularFire@0.3.1.json @@ -1,5 +1,5 @@ { "dependencyShim": { - "angularFire": ["angular"] + "angularFire": ["angular@1.1.5"] } } From 5ce2a5c458fb6da840ef755bba49145cc0c09af2 Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Fri, 25 Oct 2013 11:37:54 +0200 Subject: [PATCH 03/10] adding kickstrap --- package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json | 6 ++++++ registry.json | 1 + 2 files changed, 7 insertions(+) create mode 100644 package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json diff --git a/package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json b/package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json new file mode 100644 index 0000000..5e29ac5 --- /dev/null +++ b/package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json @@ -0,0 +1,6 @@ +{ + "main": "kickstrap", + "dependencyShim": { + "kickstrap": ["jquery@1.10"] + } +} diff --git a/registry.json b/registry.json index cbceaa4..5906c43 100644 --- a/registry.json +++ b/registry.json @@ -5,6 +5,7 @@ "backbone": "github:jashkenas/backbone", "bootstrap": "github:twbs/bootstrap", "jquery": "github:components/jquery", + "kickstrap": "github:ajkochanowicz/Kickstrap", "underscore": "npm:underscore", "webfont": "cdnjs:webfont/1.3.0#webfont" } From b4e7218413107b20092e7407bf6b9e1fddd92310 Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Fri, 25 Oct 2013 12:13:46 +0200 Subject: [PATCH 04/10] correcting main entry for kickstrap --- .../github/ajkochanowicz/kickstrap@1.3.2.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json b/package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json index 5e29ac5..cb22bfa 100644 --- a/package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json +++ b/package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json @@ -1,6 +1,9 @@ { - "main": "kickstrap", + "main": "Kickstrap/js/kickstrap", "dependencyShim": { - "kickstrap": ["jquery@1.10"] + "Kickstrap/js/kickstrap": ["jquery"] + }, + "dependencyMap": { + "jquery": "jquery@1.10" } } From a7f9f582b11ac6f4a1be77249fc5abdc4129ec76 Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Sun, 27 Oct 2013 11:48:21 +0200 Subject: [PATCH 05/10] renaming kickstrap to capital K --- .../github/ajkochanowicz/{kickstrap@1.3.2.json => asdf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package-overrides/github/ajkochanowicz/{kickstrap@1.3.2.json => asdf} (100%) diff --git a/package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json b/package-overrides/github/ajkochanowicz/asdf similarity index 100% rename from package-overrides/github/ajkochanowicz/kickstrap@1.3.2.json rename to package-overrides/github/ajkochanowicz/asdf From 52ee72776b04ad90a91ab8d7fd410b6e2335865d Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Sun, 27 Oct 2013 11:48:57 +0200 Subject: [PATCH 06/10] renaming kickstrap to a capital K --- .../github/ajkochanowicz/{asdf => Kickstrap@1.3.2.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package-overrides/github/ajkochanowicz/{asdf => Kickstrap@1.3.2.json} (100%) diff --git a/package-overrides/github/ajkochanowicz/asdf b/package-overrides/github/ajkochanowicz/Kickstrap@1.3.2.json similarity index 100% rename from package-overrides/github/ajkochanowicz/asdf rename to package-overrides/github/ajkochanowicz/Kickstrap@1.3.2.json From 07d4f6d06e548118dd116beee31564be1cd4934d Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Mon, 28 Oct 2013 23:29:04 +0200 Subject: [PATCH 07/10] adding tinygrowl --- package-overrides/github/ajkochanowicz/tinygrowl.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 package-overrides/github/ajkochanowicz/tinygrowl.json diff --git a/package-overrides/github/ajkochanowicz/tinygrowl.json b/package-overrides/github/ajkochanowicz/tinygrowl.json new file mode 100644 index 0000000..f276806 --- /dev/null +++ b/package-overrides/github/ajkochanowicz/tinygrowl.json @@ -0,0 +1,5 @@ +{ + "dependencyShim": { + "tinygrowl": ["bootstrap@3.0.0"] + } +} From c2472e03c19597a46d05ef3b6d1a444efe541378 Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Mon, 28 Oct 2013 23:30:00 +0200 Subject: [PATCH 08/10] adding tinygrowl to registry.json --- registry.json | 1 + 1 file changed, 1 insertion(+) diff --git a/registry.json b/registry.json index 5906c43..0286fab 100644 --- a/registry.json +++ b/registry.json @@ -6,6 +6,7 @@ "bootstrap": "github:twbs/bootstrap", "jquery": "github:components/jquery", "kickstrap": "github:ajkochanowicz/Kickstrap", + "tinygrowl": "github:ajkochanowicz/tinygrowl", "underscore": "npm:underscore", "webfont": "cdnjs:webfont/1.3.0#webfont" } From 71e8de5ea71eb3f5ba4cf5f87b4c8dfe56fb3918 Mon Sep 17 00:00:00 2001 From: Jarreddebeer Date: Mon, 28 Oct 2013 23:41:35 +0200 Subject: [PATCH 09/10] adding chosen --- registry.json | 1 + 1 file changed, 1 insertion(+) diff --git a/registry.json b/registry.json index 0286fab..04ee9c3 100644 --- a/registry.json +++ b/registry.json @@ -4,6 +4,7 @@ "angularFire": "github:firebase/angularFire", "backbone": "github:jashkenas/backbone", "bootstrap": "github:twbs/bootstrap", + "chosen.jquery": "cdnjs:chosen/{version}#chosen.jquery", "jquery": "github:components/jquery", "kickstrap": "github:ajkochanowicz/Kickstrap", "tinygrowl": "github:ajkochanowicz/tinygrowl", From 4d5e54d2d91add245e2b120c8810354cd80ed876 Mon Sep 17 00:00:00 2001 From: Jarred de Beer Date: Fri, 1 Nov 2013 21:12:24 +0200 Subject: [PATCH 10/10] adding backbone.marionette --- .../github/marionettejs/backbone.marionette@1.2.2.json | 9 +++++++++ registry.json | 1 + 2 files changed, 10 insertions(+) create mode 100644 package-overrides/github/marionettejs/backbone.marionette@1.2.2.json diff --git a/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json b/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json new file mode 100644 index 0000000..7c2f6e6 --- /dev/null +++ b/package-overrides/github/marionettejs/backbone.marionette@1.2.2.json @@ -0,0 +1,9 @@ +{ + "main": "lib/backbone.marionette.min", + "dependencyShim": { + "lib/backbone.marionette.min": ["backbone"] + }, + "dependencyMap": { + "backbone": "backbone@1.1.0" + } +} diff --git a/registry.json b/registry.json index 04ee9c3..a00effe 100644 --- a/registry.json +++ b/registry.json @@ -7,6 +7,7 @@ "chosen.jquery": "cdnjs:chosen/{version}#chosen.jquery", "jquery": "github:components/jquery", "kickstrap": "github:ajkochanowicz/Kickstrap", + "marionette": "github:marionettejs/backbone.marionette", "tinygrowl": "github:ajkochanowicz/tinygrowl", "underscore": "npm:underscore", "webfont": "cdnjs:webfont/1.3.0#webfont"