From b8df81262127dd9e6f19f5fb5e5074119c9262c3 Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Sat, 4 Jul 2015 19:17:23 -0400 Subject: [PATCH 1/5] all possible unregistered packages in package.json replaced/upgraded (upgrading swagger-node-express breaks api tests) --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 621a00ce75..59b9c8df47 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "domain-middleware": "~0.1.0", "express": "~3.17.5", "express-csv": "~0.6.0", - "git-changelog": "colegleason/git-changelog", "grunt": "~0.4.1", "grunt-browserify": "^3.3.0", "grunt-cli": "~0.1.9", @@ -33,7 +32,7 @@ "grunt-nodemon": "~0.3.0", "grunt-spritesmith": "~3.5.0", "gulp": "^3.9.0", - "icalendar": "git://github.com/lefnire/node-icalendar#master", + "icalendar": "^0.7.1", "image-size": "~0.3.2", "in-app-purchase": "^0.2.0", "jade": "~1.7.0", @@ -54,7 +53,7 @@ "passport-facebook": "2.0.0", "paypal-ipn": "2.1.0", "paypal-rest-sdk": "^1.2.1", - "pretty-data": "git://github.com/vkiryukhin/pretty-data#master", + "pretty-data": "^0.40.0", "ps-tree": "^1.0.0", "push-notify": "^1.1.1", "q": "^1.4.1", @@ -62,7 +61,7 @@ "request": "~2.44.0", "s3-upload-stream": "^1.0.6", "stripe": "*", - "swagger-node-express": "git://github.com/lefnire/swagger-node-express#habitrpg", + "swagger-node-express": "lefnire/swagger-node-express#habitrpg", "universal-analytics": "~0.3.2", "validator": "~3.19.0", "winston": "~0.8.0", @@ -92,6 +91,7 @@ "deep-diff": "~0.1.4", "event-stream": "^3.2.2", "expect.js": "~0.2.0", + "git-changelog": "^0.1.8", "glob": "^4.3.5", "grunt-contrib-imagemin": "^0.9.4", "istanbul": "^0.3.14", From 4c70cfd8d2dc5722d7beb98bcada58bb88850d0c Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Sat, 4 Jul 2015 19:20:24 -0400 Subject: [PATCH 2/5] simplify github repo urls in bower packages file --- bower.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bower.json b/bower.json index 6ca8ce8c2e..d65852a417 100644 --- a/bower.json +++ b/bower.json @@ -21,25 +21,25 @@ "angular-sanitize": "1.3.9", "angular-resource": "1.3.9", "angular-ui-utils": "~0.1.0", - "angular-ui-select2": "git://github.com/angular-ui/ui-select2.git", + "angular-ui-select2": "angular-ui/ui-select2", "angular-bootstrap": "~0.13.0", "angular-loading-bar": "~0.6.0", "bootstrap": "~3.1.0", - "bootstrap-growl": "git://github.com/ifightcrime/bootstrap-growl.git#master", + "bootstrap-growl": "ifightcrime/bootstrap-growl", "bootstrap-tour": "~0.10.1", - "BrowserQuest": "git://github.com/browserquest/BrowserQuest.git", - "github-buttons": "git://github.com/mdo/github-buttons.git", + "BrowserQuest": "browserquest/BrowserQuest", + "github-buttons": "mdo/github-buttons", "marked": "~0.2.9", - "Angular-At-Directive": "git://github.com/snicker/Angular-At-Directive#master", - "js-emoji": "git://github.com/snicker/js-emoji#master", + "Angular-At-Directive": "snicker/Angular-At-Directive", + "js-emoji": "snicker/js-emoji", "sticky": "*", - "swagger-ui": "git://github.com/wordnik/swagger-ui.git#v2.0.24", + "swagger-ui": "wordnik/swagger-ui#v2.0.24", "ngInfiniteScroll": "1.0.0", "jquery-colorbox": "~1.4.36", "pnotify": "~1.3.1", "jquery-ui": "~1.10.3", "hello": "~1.5.0", - "css-social-buttons": "https://github.com/samcollins/css-social-buttons.git#4c045e5", + "css-social-buttons": "samcollins/css-social-buttons#4c045e5", "angular-filter": "~0.5.1", "angular-ui-router": "~0.2.13" }, From bd39d378fdb1c99b782d4d09f66df103c3ff41b4 Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Sat, 4 Jul 2015 20:08:21 -0400 Subject: [PATCH 3/5] update or pin unregistered bower packages --- bower.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bower.json b/bower.json index d65852a417..06e1914102 100644 --- a/bower.json +++ b/bower.json @@ -21,17 +21,11 @@ "angular-sanitize": "1.3.9", "angular-resource": "1.3.9", "angular-ui-utils": "~0.1.0", - "angular-ui-select2": "angular-ui/ui-select2", "angular-bootstrap": "~0.13.0", "angular-loading-bar": "~0.6.0", "bootstrap": "~3.1.0", - "bootstrap-growl": "ifightcrime/bootstrap-growl", "bootstrap-tour": "~0.10.1", - "BrowserQuest": "browserquest/BrowserQuest", - "github-buttons": "mdo/github-buttons", "marked": "~0.2.9", - "Angular-At-Directive": "snicker/Angular-At-Directive", - "js-emoji": "snicker/js-emoji", "sticky": "*", "swagger-ui": "wordnik/swagger-ui#v2.0.24", "ngInfiniteScroll": "1.0.0", @@ -41,7 +35,13 @@ "hello": "~1.5.0", "css-social-buttons": "samcollins/css-social-buttons#4c045e5", "angular-filter": "~0.5.1", - "angular-ui-router": "~0.2.13" + "angular-ui-router": "~0.2.13", + "js-emoji": "snicker/js-emoji#f25d8a303f", + "Angular-At-Directive": "snicker/Angular-At-Directive#c27bae207aa06d1e", + "angular-ui-select2": "angular-ui/ui-select2#afa6589a54cb72815f", + "bootstrap-growl": "ifightcrime/bootstrap-growl#162daa41cd1155f", + "BrowserQuest": "browserquest/BrowserQuest#c3a960b03031dad5d", + "github-buttons": "~0.0.4" }, "devDependencies": { "angular-mocks": "1.3.9" From fca4ef8d3f70f418b1e079ca76903b1eb6232eeb Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 5 Jul 2015 21:18:53 -0500 Subject: [PATCH 4/5] Remove changelog; pin to lefnire's version of icalendar --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 59b9c8df47..3190070bc0 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "grunt-nodemon": "~0.3.0", "grunt-spritesmith": "~3.5.0", "gulp": "^3.9.0", - "icalendar": "^0.7.1", + "icalendar": "lefnire/node-icalendar#e06da0e55901f0ba940dfadc42c158ed0b1fead9", "image-size": "~0.3.2", "in-app-purchase": "^0.2.0", "jade": "~1.7.0", @@ -91,7 +91,6 @@ "deep-diff": "~0.1.4", "event-stream": "^3.2.2", "expect.js": "~0.2.0", - "git-changelog": "^0.1.8", "glob": "^4.3.5", "grunt-contrib-imagemin": "^0.9.4", "istanbul": "^0.3.14", From 1ae505eabd6baa32dbc8406a9197d8aa432d5738 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 5 Jul 2015 21:58:31 -0500 Subject: [PATCH 5/5] Adjust tags for bower; Set github link to main habitrpg org --- bower.json | 4 ++-- website/views/shared/footer.jade | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index 06e1914102..b828fe5ccd 100644 --- a/bower.json +++ b/bower.json @@ -33,7 +33,7 @@ "pnotify": "~1.3.1", "jquery-ui": "~1.10.3", "hello": "~1.5.0", - "css-social-buttons": "samcollins/css-social-buttons#4c045e5", + "css-social-buttons": "samcollins/css-social-buttons#v1.1.1 ", "angular-filter": "~0.5.1", "angular-ui-router": "~0.2.13", "js-emoji": "snicker/js-emoji#f25d8a303f", @@ -41,7 +41,7 @@ "angular-ui-select2": "angular-ui/ui-select2#afa6589a54cb72815f", "bootstrap-growl": "ifightcrime/bootstrap-growl#162daa41cd1155f", "BrowserQuest": "browserquest/BrowserQuest#c3a960b03031dad5d", - "github-buttons": "~0.0.4" + "github-buttons": "mdo/github-buttons#v3.0.0" }, "devDependencies": { "angular-mocks": "1.3.9" diff --git a/website/views/shared/footer.jade b/website/views/shared/footer.jade index caacfd09f4..b461b16ec7 100644 --- a/website/views/shared/footer.jade +++ b/website/views/shared/footer.jade @@ -69,7 +69,7 @@ footer.footer(ng-controller='FooterCtrl') a.addthis_button_tweet(tw:via='habitrpg') tr td - iframe(src='/bower_components/github-buttons/github-btn.html?user=lefnire&repo=habitrpg&type=watch&count=true', allowtransparency='true', frameborder='0', scrolling='0', width='85px', height='20px') + iframe(src='/bower_components/github-buttons/github-btn.html?user=habitrpg&repo=habitrpg&type=watch&count=true', allowtransparency='true', frameborder='0', scrolling='0', width='85px', height='20px') tr td a.addthis_button_google_plusone(g:plusone:size='medium')