From 218c048f35d465fa0324b7aec7ff4ac0f93a2cf9 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Wed, 10 Sep 2014 22:05:57 +0200 Subject: [PATCH 01/25] Create react-bower@0.11.0.json --- package-overrides/github/reactjs/react-bower@0.11.0.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 package-overrides/github/reactjs/react-bower@0.11.0.json diff --git a/package-overrides/github/reactjs/react-bower@0.11.0.json b/package-overrides/github/reactjs/react-bower@0.11.0.json new file mode 100644 index 0000000..fffe3b4 --- /dev/null +++ b/package-overrides/github/reactjs/react-bower@0.11.0.json @@ -0,0 +1,4 @@ +{ + "main": "react", + "format": "global" +} From 46af817367d0d5bbbfd7e1f70ea80e4054f5b335 Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Fri, 12 Sep 2014 13:43:47 +0200 Subject: [PATCH 02/25] add: override for bower-angular-cookies 1.3.0-rc.1 --- .../github/angular/bower-angular-cookies@1.3.0-rc.1.json | 3 +++ registry.json | 1 + 2 files changed, 4 insertions(+) create mode 100644 package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json diff --git a/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json b/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json new file mode 100644 index 0000000..c3911da --- /dev/null +++ b/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json @@ -0,0 +1,3 @@ +{ + "main": "angular-cookies" +} diff --git a/registry.json b/registry.json index 6f7b2f4..0e18aaf 100644 --- a/registry.json +++ b/registry.json @@ -9,6 +9,7 @@ "ace": "github:ajaxorg/ace-builds", "angular": "github:angular/bower-angular", "angular-mocks": "github:angular/bower-angular-mocks", + "angular-cookies": "github:angular/bower-angular-cookies", "angularFire": "github:firebase/angularFire", "backbone": "npm:backbone", "backbone.babysitter": "github:marionettejs/backbone.babysitter", From ab9cd84de455248e71144c917bd939a5870a6d2f Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Fri, 12 Sep 2014 14:29:02 +0200 Subject: [PATCH 03/25] fix: add 'angular' as dependency to bower-angular-cookies 1.3.0-rc.1 --- .../angular/bower-angular-cookies@1.3.0-rc.1.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json b/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json index c3911da..6591688 100644 --- a/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json +++ b/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json @@ -1,3 +1,11 @@ { - "main": "angular-cookies" + "main": "angular-cookies", + "shim": { + "angular-cookies": { + "deps": ["angular"] + } + }, + "dependencies": { + "angular": "1.3.0-rc.1" + } } From 3f50a48463b49edbd5fd0963894a6377bb87026f Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Fri, 12 Sep 2014 14:36:34 +0200 Subject: [PATCH 04/25] Update bower-angular-cookies@1.3.0-rc.1.json --- .../github/angular/bower-angular-cookies@1.3.0-rc.1.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json b/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json index 6591688..00d6f82 100644 --- a/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json +++ b/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json @@ -5,6 +5,7 @@ "deps": ["angular"] } }, + "registry": "jspm", "dependencies": { "angular": "1.3.0-rc.1" } From f50a52352c8fa27b9c2e348129153b483bcf8b68 Mon Sep 17 00:00:00 2001 From: subesokun Date: Fri, 12 Sep 2014 14:52:01 +0200 Subject: [PATCH 05/25] Create di.js@master Package override for di.js --- package-overrides/github/angular/di.js@master | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 package-overrides/github/angular/di.js@master diff --git a/package-overrides/github/angular/di.js@master b/package-overrides/github/angular/di.js@master new file mode 100644 index 0000000..8900dad --- /dev/null +++ b/package-overrides/github/angular/di.js@master @@ -0,0 +1,7 @@ +{ + "main": "index", + "directories": { + "lib": "src" + }, + "format": "es6" +} From 036a3fd84434272f1ca8a895e62090a1be2ac2fa Mon Sep 17 00:00:00 2001 From: subesokun Date: Fri, 12 Sep 2014 14:57:50 +0200 Subject: [PATCH 06/25] Update registry.json Added di.js --- registry.json | 1 + 1 file changed, 1 insertion(+) diff --git a/registry.json b/registry.json index 0e18aaf..a882f9a 100644 --- a/registry.json +++ b/registry.json @@ -21,6 +21,7 @@ "cram": "github:cujojs/cram", "curl": "github:cujojs/curl", "d3": "github:mbostock/d3", + "di": "github:angular/di.js", "dropzone": "github:enyo/dropzone", "ember": "github:components/ember", "ember-data": "github:components/ember-data", From 46a5a4aac56e03ab80e4b0bf0ee274e33ff521ed Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Sat, 13 Sep 2014 01:49:37 +0200 Subject: [PATCH 07/25] add: override for bower-angular-animate 1.3.0-rc.1 --- .../angular/bower-angular-animate@1.3.0-rc.1.json | 15 +++++++++++++++ registry.json | 1 + 2 files changed, 16 insertions(+) create mode 100644 package-overrides/github/angular/bower-angular-animate@1.3.0-rc.1.json diff --git a/package-overrides/github/angular/bower-angular-animate@1.3.0-rc.1.json b/package-overrides/github/angular/bower-angular-animate@1.3.0-rc.1.json new file mode 100644 index 0000000..0326ea6 --- /dev/null +++ b/package-overrides/github/angular/bower-angular-animate@1.3.0-rc.1.json @@ -0,0 +1,15 @@ +{ + "main": "angular-animate", + "shim": { + "angular-animate": { + "deps": ["angular"] + } + }, + "registry": "jspm", + "dependencies": { + "angular": "1.3.0-rc.1" + }, + "buildConfig": { + "minify": true + } +} diff --git a/registry.json b/registry.json index 0e18aaf..0679504 100644 --- a/registry.json +++ b/registry.json @@ -10,6 +10,7 @@ "angular": "github:angular/bower-angular", "angular-mocks": "github:angular/bower-angular-mocks", "angular-cookies": "github:angular/bower-angular-cookies", + "angular-animate": "github:angular/bower-angular-animate", "angularFire": "github:firebase/angularFire", "backbone": "npm:backbone", "backbone.babysitter": "github:marionettejs/backbone.babysitter", From 12fd7869eb5bf9e12f3df8ced88b184f596a100b Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Sat, 13 Sep 2014 01:55:56 +0200 Subject: [PATCH 08/25] add: override for (angular) bower-material 0.0.2 --- .../github/angular/bower-material@0.0.2.json | 15 +++++++++++++++ registry.json | 1 + 2 files changed, 16 insertions(+) create mode 100644 package-overrides/github/angular/bower-material@0.0.2.json diff --git a/package-overrides/github/angular/bower-material@0.0.2.json b/package-overrides/github/angular/bower-material@0.0.2.json new file mode 100644 index 0000000..599ae79 --- /dev/null +++ b/package-overrides/github/angular/bower-material@0.0.2.json @@ -0,0 +1,15 @@ +{ + "main": "angular-material", + "shim": { + "angular-material": { + "deps": ["angular"] + } + }, + "registry": "jspm", + "dependencies": { + "angular": "1.3" + }, + "buildConfig": { + "minify": true + } +} diff --git a/registry.json b/registry.json index 0679504..88acf8f 100644 --- a/registry.json +++ b/registry.json @@ -11,6 +11,7 @@ "angular-mocks": "github:angular/bower-angular-mocks", "angular-cookies": "github:angular/bower-angular-cookies", "angular-animate": "github:angular/bower-angular-animate", + "angular-material": "github:angular/bower-material", "angularFire": "github:firebase/angularFire", "backbone": "npm:backbone", "backbone.babysitter": "github:marionettejs/backbone.babysitter", From 9a175c13ed05263cd714ad741552e0eaeb77d53f Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Sat, 13 Sep 2014 02:04:20 +0200 Subject: [PATCH 09/25] add: override for (angular) bower-material master branch --- .../github/angular/bower-material@master.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 package-overrides/github/angular/bower-material@master.json diff --git a/package-overrides/github/angular/bower-material@master.json b/package-overrides/github/angular/bower-material@master.json new file mode 100644 index 0000000..599ae79 --- /dev/null +++ b/package-overrides/github/angular/bower-material@master.json @@ -0,0 +1,15 @@ +{ + "main": "angular-material", + "shim": { + "angular-material": { + "deps": ["angular"] + } + }, + "registry": "jspm", + "dependencies": { + "angular": "1.3" + }, + "buildConfig": { + "minify": true + } +} From 5f61007939b17ed999e833cff066bb09448e0e98 Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Sun, 14 Sep 2014 19:45:35 +0200 Subject: [PATCH 10/25] refactor: change angular dependency to 'angular@^1.3.0-rc.1'. that way the latest rc, or 1.3.0 or 1.x.x will be loaded in due course. --- .../github/angular/bower-angular-animate@1.3.0-rc.1.json | 2 +- .../github/angular/bower-angular-cookies@1.3.0-rc.1.json | 5 ++++- package-overrides/github/angular/bower-material@master.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package-overrides/github/angular/bower-angular-animate@1.3.0-rc.1.json b/package-overrides/github/angular/bower-angular-animate@1.3.0-rc.1.json index 0326ea6..230e6fa 100644 --- a/package-overrides/github/angular/bower-angular-animate@1.3.0-rc.1.json +++ b/package-overrides/github/angular/bower-angular-animate@1.3.0-rc.1.json @@ -7,7 +7,7 @@ }, "registry": "jspm", "dependencies": { - "angular": "1.3.0-rc.1" + "angular": "^1.3.0-rc.1" }, "buildConfig": { "minify": true diff --git a/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json b/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json index 00d6f82..d5f8915 100644 --- a/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json +++ b/package-overrides/github/angular/bower-angular-cookies@1.3.0-rc.1.json @@ -7,6 +7,9 @@ }, "registry": "jspm", "dependencies": { - "angular": "1.3.0-rc.1" + "angular": "^1.3.0-rc.1" + }, + "buildConfig": { + "minify": true } } diff --git a/package-overrides/github/angular/bower-material@master.json b/package-overrides/github/angular/bower-material@master.json index 599ae79..71c92fa 100644 --- a/package-overrides/github/angular/bower-material@master.json +++ b/package-overrides/github/angular/bower-material@master.json @@ -7,7 +7,7 @@ }, "registry": "jspm", "dependencies": { - "angular": "1.3" + "angular": "^1.3.0-rc.1" }, "buildConfig": { "minify": true From 1116e76b4987884a4017506bca646a068ebf17eb Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Sun, 14 Sep 2014 20:21:03 +0200 Subject: [PATCH 11/25] fix: change angular dependency to 'angular@^1.3.0-rc.1' --- package-overrides/github/angular/bower-material@0.0.2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-overrides/github/angular/bower-material@0.0.2.json b/package-overrides/github/angular/bower-material@0.0.2.json index 599ae79..71c92fa 100644 --- a/package-overrides/github/angular/bower-material@0.0.2.json +++ b/package-overrides/github/angular/bower-material@0.0.2.json @@ -7,7 +7,7 @@ }, "registry": "jspm", "dependencies": { - "angular": "1.3" + "angular": "^1.3.0-rc.1" }, "buildConfig": { "minify": true From 2acdf4848052eaef1677467a985907db3d24c4b3 Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Wed, 17 Sep 2014 10:38:24 +0200 Subject: [PATCH 12/25] fix: angular-material dependencies --- package-overrides/github/angular/bower-material@0.0.2.json | 4 +++- package-overrides/github/angular/bower-material@master.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package-overrides/github/angular/bower-material@0.0.2.json b/package-overrides/github/angular/bower-material@0.0.2.json index 71c92fa..c16a302 100644 --- a/package-overrides/github/angular/bower-material@0.0.2.json +++ b/package-overrides/github/angular/bower-material@0.0.2.json @@ -7,7 +7,9 @@ }, "registry": "jspm", "dependencies": { - "angular": "^1.3.0-rc.1" + "angular": "^1.3.0-rc.1", + "angular-animate": "^1.3.0-rc.1", + "hammer": "^2.0.3" }, "buildConfig": { "minify": true diff --git a/package-overrides/github/angular/bower-material@master.json b/package-overrides/github/angular/bower-material@master.json index 71c92fa..c16a302 100644 --- a/package-overrides/github/angular/bower-material@master.json +++ b/package-overrides/github/angular/bower-material@master.json @@ -7,7 +7,9 @@ }, "registry": "jspm", "dependencies": { - "angular": "^1.3.0-rc.1" + "angular": "^1.3.0-rc.1", + "angular-animate": "^1.3.0-rc.1", + "hammer": "^2.0.3" }, "buildConfig": { "minify": true From 6038346d591fc20f938deafff841e7343cfe0b0c Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Wed, 17 Sep 2014 11:01:54 +0200 Subject: [PATCH 13/25] add: angular-ui-router to registry.json --- registry.json | 1 + 1 file changed, 1 insertion(+) diff --git a/registry.json b/registry.json index 1c9385e..9910b92 100644 --- a/registry.json +++ b/registry.json @@ -12,6 +12,7 @@ "angular-cookies": "github:angular/bower-angular-cookies", "angular-animate": "github:angular/bower-angular-animate", "angular-material": "github:angular/bower-material", + "angular-ui-router": "github:angular-ui/ui-router", "angularFire": "github:firebase/angularFire", "backbone": "npm:backbone", "backbone.babysitter": "github:marionettejs/backbone.babysitter", From 59c42f5c948819b2f39a5fc714d75a3c5af8ef85 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Fri, 19 Sep 2014 20:11:04 +0200 Subject: [PATCH 14/25] Rename di.js@master to di.js@master.json --- .../github/angular/{di.js@master => di.js@master.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package-overrides/github/angular/{di.js@master => di.js@master.json} (100%) diff --git a/package-overrides/github/angular/di.js@master b/package-overrides/github/angular/di.js@master.json similarity index 100% rename from package-overrides/github/angular/di.js@master rename to package-overrides/github/angular/di.js@master.json From 271d5cb3657d2180458bb9d4604b247b16381570 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Sun, 21 Sep 2014 18:16:15 +0200 Subject: [PATCH 15/25] add jsplumb --- registry.json | 1 + 1 file changed, 1 insertion(+) diff --git a/registry.json b/registry.json index 9910b92..7ce4f30 100644 --- a/registry.json +++ b/registry.json @@ -69,6 +69,7 @@ "showdown": "github:coreyti/showdown", "skrollr": "github:Prinzhorn/skrollr", "spin": "github:fgnass/spin.js", + "jsplumb": "github:sporritt/jsPlumb", "tinygrowl": "github:ajkochanowicz/tinygrowl", "typeahead": "github:twitter/typeahead.js", "underscore": "npm:underscore", From d05501228e54fed6b555b7f21d42e96352142049 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Sun, 21 Sep 2014 18:16:42 +0200 Subject: [PATCH 16/25] Update registry.json --- registry.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry.json b/registry.json index 7ce4f30..7e3cfc0 100644 --- a/registry.json +++ b/registry.json @@ -40,6 +40,7 @@ "jquery-file-upload": "github:blueimp/jQuery-File-Upload", "jquery-pjax": "github:defunkt/jquery-pjax", "jquery.cookie": "github:carhartl/jquery-cookie", + "jsplumb": "github:sporritt/jsPlumb", "kickstrap": "github:ajkochanowicz/Kickstrap", "less": "github:matthewp/plugin-less", "lodash": "npm:lodash-node", @@ -69,7 +70,6 @@ "showdown": "github:coreyti/showdown", "skrollr": "github:Prinzhorn/skrollr", "spin": "github:fgnass/spin.js", - "jsplumb": "github:sporritt/jsPlumb", "tinygrowl": "github:ajkochanowicz/tinygrowl", "typeahead": "github:twitter/typeahead.js", "underscore": "npm:underscore", From 67b3e803835081831eb07438ff3d5a73eb1ade5f Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Sun, 21 Sep 2014 18:25:58 +0200 Subject: [PATCH 17/25] Create jsPlumb@1.6.4.json --- package-overrides/github/sporritt/jsPlumb@1.6.4.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 package-overrides/github/sporritt/jsPlumb@1.6.4.json diff --git a/package-overrides/github/sporritt/jsPlumb@1.6.4.json b/package-overrides/github/sporritt/jsPlumb@1.6.4.json new file mode 100644 index 0000000..8ee0333 --- /dev/null +++ b/package-overrides/github/sporritt/jsPlumb@1.6.4.json @@ -0,0 +1,10 @@ +{ + "directories": { + "dist": "dist" + }, + "main": "js/dom.jsPlumb-1.6.4", + "format": "global", + "buildConfig": { + "minify": true + } +} From a5597c0935af311d193dfca570f42f4ac89b21f5 Mon Sep 17 00:00:00 2001 From: Andreas Grimm Date: Wed, 24 Sep 2014 11:34:02 +0200 Subject: [PATCH 18/25] add: new angular-material overrides 0.0.3 and (in foresight) 0.0.4 --- .../github/angular/bower-material@0.0.3.json | 17 +++++++++++++++++ .../github/angular/bower-material@0.0.4.json | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 package-overrides/github/angular/bower-material@0.0.3.json create mode 100644 package-overrides/github/angular/bower-material@0.0.4.json diff --git a/package-overrides/github/angular/bower-material@0.0.3.json b/package-overrides/github/angular/bower-material@0.0.3.json new file mode 100644 index 0000000..c16a302 --- /dev/null +++ b/package-overrides/github/angular/bower-material@0.0.3.json @@ -0,0 +1,17 @@ +{ + "main": "angular-material", + "shim": { + "angular-material": { + "deps": ["angular"] + } + }, + "registry": "jspm", + "dependencies": { + "angular": "^1.3.0-rc.1", + "angular-animate": "^1.3.0-rc.1", + "hammer": "^2.0.3" + }, + "buildConfig": { + "minify": true + } +} diff --git a/package-overrides/github/angular/bower-material@0.0.4.json b/package-overrides/github/angular/bower-material@0.0.4.json new file mode 100644 index 0000000..c16a302 --- /dev/null +++ b/package-overrides/github/angular/bower-material@0.0.4.json @@ -0,0 +1,17 @@ +{ + "main": "angular-material", + "shim": { + "angular-material": { + "deps": ["angular"] + } + }, + "registry": "jspm", + "dependencies": { + "angular": "^1.3.0-rc.1", + "angular-animate": "^1.3.0-rc.1", + "hammer": "^2.0.3" + }, + "buildConfig": { + "minify": true + } +} From bdac06a1ca8f5f1cc0648ba7f3a065d1df634185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Cevey?= Date: Mon, 29 Sep 2014 11:48:47 +0100 Subject: [PATCH 19/25] Add jquery.Jcrop override --- .../github/tapmodo/Jcrop@0.9.12.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 package-overrides/github/tapmodo/Jcrop@0.9.12.json diff --git a/package-overrides/github/tapmodo/Jcrop@0.9.12.json b/package-overrides/github/tapmodo/Jcrop@0.9.12.json new file mode 100644 index 0000000..60c2e72 --- /dev/null +++ b/package-overrides/github/tapmodo/Jcrop@0.9.12.json @@ -0,0 +1,16 @@ +{ + "main": "js/jquery.Jcrop", + "shim": { + "js/jquery.Jcrop": [ + "jquery" + ] + }, + "files": [ + "js/jquery.Jcrop.js", + "css/Jcrop.gif", + "css/jquery.Jcrop.css" + ], + "buildConfig": { + "uglify": true + } +} From 0e569c728f9fafed28e985d4c642ab23d582151b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Cevey?= Date: Mon, 29 Sep 2014 12:04:48 +0100 Subject: [PATCH 20/25] Add jquery as a dependency --- package-overrides/github/tapmodo/Jcrop@0.9.12.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package-overrides/github/tapmodo/Jcrop@0.9.12.json b/package-overrides/github/tapmodo/Jcrop@0.9.12.json index 60c2e72..bbd6f89 100644 --- a/package-overrides/github/tapmodo/Jcrop@0.9.12.json +++ b/package-overrides/github/tapmodo/Jcrop@0.9.12.json @@ -1,5 +1,8 @@ { "main": "js/jquery.Jcrop", + "dependencies": { + "jquery": "*" + }, "shim": { "js/jquery.Jcrop": [ "jquery" From a008428c3e8532725af56b4c740ab1b9e6385aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Cevey?= Date: Mon, 29 Sep 2014 12:07:28 +0100 Subject: [PATCH 21/25] add jcrop to registry --- registry.json | 1 + 1 file changed, 1 insertion(+) diff --git a/registry.json b/registry.json index 7e3cfc0..b00d58c 100644 --- a/registry.json +++ b/registry.json @@ -35,6 +35,7 @@ "handlebars": "github:components/handlebars.js", "handlebars.js": "github:components/handlebars.js", "intro": "github:usablica/intro.js", + "jcrop": "github:tapmodo/Jcrop", "jiff": "github:cujojs/jiff", "jquery": "github:components/jquery", "jquery-file-upload": "github:blueimp/jQuery-File-Upload", From 543c3958f0ff1c013770ca36cd29bc5d18f245ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Cevey?= Date: Mon, 29 Sep 2014 12:29:32 +0100 Subject: [PATCH 22/25] Add css plugin and file as a dependency --- package-overrides/github/tapmodo/Jcrop@0.9.12.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package-overrides/github/tapmodo/Jcrop@0.9.12.json b/package-overrides/github/tapmodo/Jcrop@0.9.12.json index bbd6f89..507655d 100644 --- a/package-overrides/github/tapmodo/Jcrop@0.9.12.json +++ b/package-overrides/github/tapmodo/Jcrop@0.9.12.json @@ -1,11 +1,13 @@ { "main": "js/jquery.Jcrop", "dependencies": { - "jquery": "*" + "jquery": "*", + "css": "*" }, "shim": { "js/jquery.Jcrop": [ - "jquery" + "jquery", + "../css/jquery.Jcrop.css!" ] }, "files": [ From da4ca5420f7331062b7c39bee3d6b890e1b96428 Mon Sep 17 00:00:00 2001 From: James Gorrie Date: Thu, 2 Oct 2014 18:02:11 +0100 Subject: [PATCH 23/25] Adding angular-ui-extras to registry --- registry.json | 1 + 1 file changed, 1 insertion(+) diff --git a/registry.json b/registry.json index b00d58c..67b37c8 100644 --- a/registry.json +++ b/registry.json @@ -13,6 +13,7 @@ "angular-animate": "github:angular/bower-angular-animate", "angular-material": "github:angular/bower-material", "angular-ui-router": "github:angular-ui/ui-router", + "angular-ui-router-extras": "github:christopherthielen/ui-router-extras", "angularFire": "github:firebase/angularFire", "backbone": "npm:backbone", "backbone.babysitter": "github:marionettejs/backbone.babysitter", From ffcf8fcabb16ac98cdbcc6fe215fdba183a667b8 Mon Sep 17 00:00:00 2001 From: Joseph Orbegoso Pea Date: Sat, 4 Oct 2014 22:14:19 -0700 Subject: [PATCH 24/25] Added Famo.us --- registry.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/registry.json b/registry.json index 67b37c8..73baa6f 100644 --- a/registry.json +++ b/registry.json @@ -30,6 +30,8 @@ "ember": "github:components/ember", "ember-data": "github:components/ember-data", "test.js": "github:some/test", + "famous": "github:Famous/famous", + "famous-angular": "github:Famous/famous-angular", "font-awesome": "npm:font-awesome", "foundation": "github:zurb/bower-foundation", "hammer": "github:hammerjs/hammer.js", From 20fad0d32587dabdff934b77dae605878df8b0a9 Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Mon, 6 Oct 2014 18:35:06 +0200 Subject: [PATCH 25/25] Update registry.json --- registry.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry.json b/registry.json index 73baa6f..f85cad5 100644 --- a/registry.json +++ b/registry.json @@ -71,7 +71,7 @@ "respond": "github:scottjehl/Respond", "rest": "github:cujojs/rest", "select2": "github:ivaynberg/select2", - "showdown": "github:coreyti/showdown", + "showdown": "github:showdownjs/showdown", "skrollr": "github:Prinzhorn/skrollr", "spin": "github:fgnass/spin.js", "tinygrowl": "github:ajkochanowicz/tinygrowl",