From 6a1bf212111425dcbf668c450701333139d948a1 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 16:13:24 -0700 Subject: [PATCH 01/16] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index c0cc9394..c4354001 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ }, "dependencies": { "async": "~0.9.0", + "pdffiller": "git+ssh://git@github.com/whitef0x0/pdffiller.git#master", "body-parser": "~1.9.0", "bower": "~1.3.8", "chalk": "~1.0.0", From 16073950bca5390d77d3abdc3bfb625a0bb8b562 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 16:20:45 -0700 Subject: [PATCH 02/16] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c4354001..47eb60a9 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "async": "~0.9.0", - "pdffiller": "git+ssh://git@github.com/whitef0x0/pdffiller.git#master", + "pdffiller": pdffiller": "whitef0x0/pdffiller", "body-parser": "~1.9.0", "bower": "~1.3.8", "chalk": "~1.0.0", From 7b73b0432288d65b724f732e8e2d0549a0072a3f Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 16:21:40 -0700 Subject: [PATCH 03/16] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 47eb60a9..f2a84fdb 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "dependencies": { "async": "~0.9.0", - "pdffiller": pdffiller": "whitef0x0/pdffiller", + "pdffiller": "whitef0x0/pdffiller", "body-parser": "~1.9.0", "bower": "~1.3.8", "chalk": "~1.0.0", From 76e21d4d2ae3e0430fa20cfe18772e944365067b Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 16:31:30 -0700 Subject: [PATCH 04/16] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index f2a84fdb..f912f602 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "then-fs": "~2.0.0" }, "devDependencies": { + "multer": "~0.1.8", "grunt-concurrent": "~1.0.0", "grunt-contrib-csslint": "~0.3.1", "grunt-contrib-cssmin": "~0.10.0", From fc6a9bfa4e94f4c2e9c8b6a786e9bfa5c1a116fe Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 16:33:38 -0700 Subject: [PATCH 05/16] Update package.json --- package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package.json b/package.json index f912f602..49182234 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,8 @@ "then-fs": "~2.0.0" }, "devDependencies": { + "mocha": ">=1.20.0", + "grunt": "~0.4.1", "multer": "~0.1.8", "grunt-concurrent": "~1.0.0", "grunt-contrib-csslint": "~0.3.1", From 9cac8142fe8601a0d093e4b5a8ae1befbedcf728 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 16:38:47 -0700 Subject: [PATCH 06/16] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49182234..e81ce06f 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "scripts": { "start": "grunt", "test": "grunt test", - "postinstall": "bower install --config.interactive=false; ./node_modules/grunt-cli/bin/grunt" + "postinstall": "bower install --config.interactive=false; grunt" }, "dependencies": { "async": "~0.9.0", From fde2aa0cfb0ecf9b13bcdfdaad2cace5dc4ad9fa Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 16:46:34 -0700 Subject: [PATCH 07/16] Update package.json --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index e81ce06f..0a30c798 100644 --- a/package.json +++ b/package.json @@ -2,11 +2,11 @@ "name": "medforms", "description": "Full-Stack JavaScript with MongoDB, Express, AngularJS, and Node.js.", "version": "0.0.1", - "private": false, - "author": "https://github.com/meanjs/mean/graphs/contributors", + "private": true, + "author": "https://github.com/whitef0x0/medforms/graphs/contributors", "repository": { "type": "git", - "url": "https://github.com/meanjs/mean.git" + "url": "https://github.com/whitef0x0/medforms.git" }, "engines": { "node": ">=0.10.28", @@ -20,6 +20,7 @@ "dependencies": { "async": "~0.9.0", "pdffiller": "whitef0x0/pdffiller", + "multer": "~0.1.8", "body-parser": "~1.9.0", "bower": "~1.3.8", "chalk": "~1.0.0", @@ -33,6 +34,7 @@ "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", @@ -40,7 +42,6 @@ "method-override": "~2.3.0", "mongoose": "~3.8.8", "morgan": "~1.4.1", - "multer": "~0.1.8", "nodemailer": "~1.3.0", "passport": "~0.2.0", "passport-facebook": "~1.0.2", @@ -54,9 +55,8 @@ "then-fs": "~2.0.0" }, "devDependencies": { - "mocha": ">=1.20.0", - "grunt": "~0.4.1", - "multer": "~0.1.8", + "multer": "~0.1.8", + "mocha": ">=1.20.0", "grunt-concurrent": "~1.0.0", "grunt-contrib-csslint": "~0.3.1", "grunt-contrib-cssmin": "~0.10.0", From ed8054b509d0931284ec5916af150d38dc9219ee Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 16:50:54 -0700 Subject: [PATCH 08/16] Update package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 0a30c798..54a63a3d 100644 --- a/package.json +++ b/package.json @@ -15,12 +15,11 @@ "scripts": { "start": "grunt", "test": "grunt test", - "postinstall": "bower install --config.interactive=false; grunt" + "postinstall": "bower install --config.interactive=false; npm install multer@0.1.8 -g; grunt" }, "dependencies": { "async": "~0.9.0", "pdffiller": "whitef0x0/pdffiller", - "multer": "~0.1.8", "body-parser": "~1.9.0", "bower": "~1.3.8", "chalk": "~1.0.0", From 5fbb5be461dc1af0f9e21795a653ea2324bc88b8 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 17:03:25 -0700 Subject: [PATCH 09/16] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54a63a3d..5898f8d1 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ }, "dependencies": { "async": "~0.9.0", + "load-grunt-tasks": "~1.0.0", "pdffiller": "whitef0x0/pdffiller", "body-parser": "~1.9.0", "bower": "~1.3.8", @@ -75,7 +76,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" } From 1371a5564253e4e8c51f69143b85c5c179f1f0cd Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 17:07:00 -0700 Subject: [PATCH 10/16] Update package.json --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 5898f8d1..3b523585 100644 --- a/package.json +++ b/package.json @@ -53,8 +53,6 @@ "satelize": "~0.1.1", "swig": "~1.4.1", "then-fs": "~2.0.0" - }, - "devDependencies": { "multer": "~0.1.8", "mocha": ">=1.20.0", "grunt-concurrent": "~1.0.0", From 1a443d1acecb3ceada91ba0a124210cad9daa118 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 17:07:48 -0700 Subject: [PATCH 11/16] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3b523585..1799b1e5 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "passport-twitter": "~1.0.2", "satelize": "~0.1.1", "swig": "~1.4.1", - "then-fs": "~2.0.0" + "then-fs": "~2.0.0", "multer": "~0.1.8", "mocha": ">=1.20.0", "grunt-concurrent": "~1.0.0", From 4f340eaba1013f1d9c4aa823f7c7a8ef0d5e2da1 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 17:12:43 -0700 Subject: [PATCH 12/16] Update form.server.model.js --- app/models/form.server.model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js index 3d2f7ffa..ebdcb105 100644 --- a/app/models/form.server.model.js +++ b/app/models/form.server.model.js @@ -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'), From b6f66ecd5106fddf0216a4b8792bbe20d827a597 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 17:13:40 -0700 Subject: [PATCH 13/16] Update form_submission.server.model.js --- app/models/form_submission.server.model.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/form_submission.server.model.js b/app/models/form_submission.server.model.js index fc97280b..80058e52 100644 --- a/app/models/form_submission.server.model.js +++ b/app/models/form_submission.server.model.js @@ -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); \ No newline at end of file +mongoose.model('FormSubmission', FormSubmissionSchema); From c5aad174e48c36bb199bf75d539333f2b292f052 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 10 Jul 2015 17:20:45 -0700 Subject: [PATCH 14/16] Update all.js --- config/env/all.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/env/all.js b/config/env/all.js index 92ec2efd..6d45479a 100755 --- a/config/env/all.js +++ b/config/env/all.js @@ -6,7 +6,7 @@ module.exports = { description: 'Generate Forms from PDFs', keywords: 'typeform, pdfs, forms, generator, form generator', }, - port: process.env.PORT || 3000, + port: process.env.PORT || 5000, templateEngine: 'swig', // The secret should be set to a non-guessable string that // is used to compute a session hash From dd304c3ef94477dbd414a83a58573e479b0dfc88 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Mon, 13 Jul 2015 11:26:07 -0700 Subject: [PATCH 15/16] Update package.json --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 1799b1e5..de4cffc7 100644 --- a/package.json +++ b/package.json @@ -9,15 +9,16 @@ "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; npm install multer@0.1.8 -g; grunt" + "postinstall": "bower install --config.interactive=false; grunt" }, "dependencies": { + "multer": "~0.1.8", "async": "~0.9.0", "load-grunt-tasks": "~1.0.0", "pdffiller": "whitef0x0/pdffiller", @@ -53,7 +54,6 @@ "satelize": "~0.1.1", "swig": "~1.4.1", "then-fs": "~2.0.0", - "multer": "~0.1.8", "mocha": ">=1.20.0", "grunt-concurrent": "~1.0.0", "grunt-contrib-csslint": "~0.3.1", From 4f7777515c74761ed4266b8787fd3d071329071c Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Mon, 13 Jul 2015 11:33:36 -0700 Subject: [PATCH 16/16] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de4cffc7..3ae8e48e 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "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",