mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-07-16 17:02:18 +00:00
Merge branch 'duckspeaker-issue-5563-pin-or-replace-unregistered-packages' into develop
This commit is contained in:
commit
6553c9b346
3 changed files with 13 additions and 14 deletions
18
bower.json
18
bower.json
|
|
@ -21,27 +21,27 @@
|
|||
"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-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-tour": "~0.10.1",
|
||||
"BrowserQuest": "git://github.com/browserquest/BrowserQuest.git",
|
||||
"github-buttons": "git://github.com/mdo/github-buttons.git",
|
||||
"marked": "~0.2.9",
|
||||
"Angular-At-Directive": "git://github.com/snicker/Angular-At-Directive#master",
|
||||
"js-emoji": "git://github.com/snicker/js-emoji#master",
|
||||
"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#v1.1.1 ",
|
||||
"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": "mdo/github-buttons#v3.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"angular-mocks": "1.3.9"
|
||||
|
|
|
|||
|
|
@ -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": "lefnire/node-icalendar#e06da0e55901f0ba940dfadc42c158ed0b1fead9",
|
||||
"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",
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
|
|
|||
Loading…
Reference in a new issue