diff --git a/.gitignore b/.gitignore index 3598aac8..09b8766c 100755 --- a/.gitignore +++ b/.gitignore @@ -27,12 +27,13 @@ app/tests/coverage/ # ====================== config/sslcerts/*.pem access.log -#public/dist/ +public/dist/ +public/dist/populate_template_cache.js uploads/ # API keys file api_keys.js *.env - + # Sublime editor # ============== .sublime-project diff --git a/README.md b/README.md index 1cc9faeb..9b2b4f98 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ TellForm ======== -Current stable release: v1.2.1 +Current stable release: v1.3.0 [![Build Status](https://travis-ci.org/whitef0x0/tellform.svg?branch=master)](https://travis-ci.org/whitef0x0/tellform) [![Dependency Status](https://gemnasium.com/whitef0x0/tellform.svg)](https://gemnasium.com/whitef0x0/tellform) diff --git a/config/env/all.js b/config/env/all.js index c24e28a0..19d4467b 100755 --- a/config/env/all.js +++ b/config/env/all.js @@ -45,7 +45,7 @@ module.exports = { /* * Upload Configuration */ - //Global upload path + //Global upload path uploadPath : 'uploads/', //PDF storage path pdfUploadPath: 'uploads/pdfs/', @@ -70,7 +70,7 @@ module.exports = { js: [ 'public/config.js', 'public/application.js', - 'public/populate_template_cache.js', + 'public/dist/populate_template_cache.js', 'public/modules/*/*.js', 'public/modules/*/*[!tests]*/*.js' ], diff --git a/gruntfile.js b/gruntfile.js index 714d4a95..af7a331f 100755 --- a/gruntfile.js +++ b/gruntfile.js @@ -2,7 +2,7 @@ module.exports = function(grunt) { require('jit-grunt')(grunt); - + // Unified Watch Object var watchFiles = { serverViews: ['app/views/**/*.*'], @@ -157,7 +157,7 @@ module.exports = function(grunt) { src: watchFiles.serverTests, options: { reporter: 'spec', - quiet: false, + quiet: false, require: 'server.js', ui: 'bdd' } @@ -243,7 +243,7 @@ module.exports = function(grunt) { }, main: { src: ['public/modules/**/views/**.html', 'public/modules/**/views/**/*.html'], - dest: 'public/populate_template_cache.js' + dest: 'public/dist/populate_template_cache.js' } } }); @@ -282,7 +282,7 @@ module.exports = function(grunt) { // Default task(s). grunt.registerTask('default', ['lint', 'html2js:main', 'env', 'concurrent:default']); - + // Debug task. grunt.registerTask('debug', ['lint', 'html2js:main', 'concurrent:debug']);