beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

merged package.json

Browse source
This commit is contained in:
David Baldwynn 2015-07-13 12:04:36 -07:00
parent 1c3471cc06 4f7777515c
commit e1220596f6
4 changed files with 103 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/form.server.model.js
View file

@ -6,7 +6,7 @@
var mongoose = require('mongoose'),
FieldSchema = require('./form_field.server.model.js'),
Schema = mongoose.Schema,
pdfFiller = require('pdfFiller'),
pdfFiller = require('pdffiller'),
_ = require('lodash'),
config = require('../../config/config'),
path = require('path'),

4
app/models/form_submission.server.model.js
View file

@ -5,7 +5,7 @@
*/
var mongoose = require('mongoose'),
Schema = mongoose.Schema,
pdfFiller = require('pdfFiller'),
pdfFiller = require('pdffiller'),
satelize = require('satelize'),
_ = require('lodash'),
config = require('../../config/config'),
@ -119,4 +119,4 @@ FormSubmissionSchema.pre('save', function (next) {
});
mongoose.model('FormSubmission', FormSubmissionSchema);
mongoose.model('FormSubmission', FormSubmissionSchema);

14
package.json
View file

@ -9,16 +9,18 @@
"url": "https://github.com/whitef0x0/medforms.git"
},
"engines": {
"node": ">=0.10.28",
"npm": ">=1.4.28"
"node": "~0.10.28",
"npm": "~1.4.28"
},
"scripts": {
"start": "grunt",
"test": "grunt test",
"postinstall": "bower install --config.interactive=false; grunt"
"postinstall": "bower install --config.interactive=false; grunt build"
},
"dependencies": {
"multer": "~0.1.8",
"async": "~0.9.0",
"load-grunt-tasks": "~1.0.0",
"pdffiller": "whitef0x0/pdffiller",
"body-parser": "~1.9.0",
"bower": "~1.3.8",
@ -51,10 +53,7 @@
"passport-twitter": "~1.0.2",
"satelize": "~0.1.1",
"swig": "~1.4.1",
"then-fs": "~2.0.0"
},
"devDependencies": {
"multer": "~0.1.8",
"then-fs": "~2.0.0",
"mocha": ">=1.20.0",
"grunt-concurrent": "~1.0.0",
"grunt-contrib-csslint": "~0.3.1",
@ -75,7 +74,6 @@
"karma-firefox-launcher": "~0.1.3",
"karma-jasmine": "~0.2.1",
"karma-phantomjs-launcher": "~0.1.2",
"load-grunt-tasks": "~1.0.0",
"should": "~4.1.0",
"supertest": "~0.14.0"
}

94
package.json.orig Normal file
View file

@ -0,0 +1,94 @@
{
"name": "medforms",
"description": "Full-Stack JavaScript with MongoDB, Express, AngularJS, and Node.js.",
"version": "0.0.1",
"private": true,
"author": "https://github.com/whitef0x0/medforms/graphs/contributors",
"repository": {
"type": "git",
"url": "https://github.com/whitef0x0/medforms.git"
},
"engines": {
"node": "~0.10.28",
"npm": "~1.4.28"
},
"scripts": {
"start": "grunt",
"test": "grunt test",
<<<<<<< HEAD
"postinstall": "bower install --config.interactive=false; grunt"
=======
"postinstall": "bower install --config.interactive=false; grunt build"
>>>>>>> 4f7777515c74761ed4266b8787fd3d071329071c
},
"dependencies": {
"multer": "~0.1.8",
"async": "~0.9.0",
<<<<<<< HEAD
=======
"load-grunt-tasks": "~1.0.0",
>>>>>>> 4f7777515c74761ed4266b8787fd3d071329071c
"pdffiller": "whitef0x0/pdffiller",
"body-parser": "~1.9.0",
"bower": "~1.3.8",
"chalk": "~1.0.0",
"compression": "~1.2.0",
"connect-flash": "~0.1.1",
"connect-mongo": "~0.4.1",
"consolidate": "~0.10.0",
"cookie-parser": "~1.3.2",
"express": "~4.10.1",
"express-session": "~1.9.1",
"forever": "~0.11.0",
"fs-extra": "~0.18.3",
"glob": "~4.0.5",
"grunt": "~0.4.1",
"grunt-cli": "~0.1.13",
"helmet": "~0.5.0",
"lodash": "~2.4.1",
"main-bower-files": "~2.8.2",
"method-override": "~2.3.0",
"mongoose": "~3.8.8",
"morgan": "~1.4.1",
"nodemailer": "~1.3.0",
"passport": "~0.2.0",
"passport-facebook": "~1.0.2",
"passport-github": "~0.1.5",
"passport-google-oauth": "~0.1.5",
"passport-linkedin": "~0.1.3",
"passport-local": "~1.0.0",
"passport-twitter": "~1.0.2",
"satelize": "~0.1.1",
"swig": "~1.4.1",
<<<<<<< HEAD
"then-fs": "~2.0.0"
},
"devDependencies": {
"multer": "~0.1.8",
=======
"then-fs": "~2.0.0",
>>>>>>> 4f7777515c74761ed4266b8787fd3d071329071c
"mocha": ">=1.20.0",
"grunt-concurrent": "~1.0.0",
"grunt-contrib-csslint": "~0.3.1",
"grunt-contrib-cssmin": "~0.10.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-uglify": "~0.6.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-env": "~0.4.1",
"grunt-karma": "~0.9.0",
"grunt-mocha-test": "~0.12.1",
"grunt-newer": "~1.1.1",
"grunt-ng-annotate": "~0.4.0",
"grunt-node-inspector": "~0.1.3",
"grunt-nodemon": "~0.3.0",
"karma": "~0.12.0",
"karma-chrome-launcher": "~0.1.2",
"karma-coverage": "~0.2.0",
"karma-firefox-launcher": "~0.1.3",
"karma-jasmine": "~0.2.1",
"karma-phantomjs-launcher": "~0.1.2",
"should": "~4.1.0",
"supertest": "~0.14.0"
}
}