Merge branch 'master' of github.com:whitef0x0/tellform
This commit is contained in:
commit
2b0d80a769
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -27,12 +27,13 @@ app/tests/coverage/
|
||||||
# ======================
|
# ======================
|
||||||
config/sslcerts/*.pem
|
config/sslcerts/*.pem
|
||||||
access.log
|
access.log
|
||||||
#public/dist/
|
public/dist/
|
||||||
|
public/dist/populate_template_cache.js
|
||||||
uploads/
|
uploads/
|
||||||
# API keys file
|
# API keys file
|
||||||
api_keys.js
|
api_keys.js
|
||||||
*.env
|
*.env
|
||||||
|
|
||||||
# Sublime editor
|
# Sublime editor
|
||||||
# ==============
|
# ==============
|
||||||
.sublime-project
|
.sublime-project
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
TellForm
|
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)
|
[![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)
|
[![Dependency Status](https://gemnasium.com/whitef0x0/tellform.svg)](https://gemnasium.com/whitef0x0/tellform)
|
||||||
|
|
4
config/env/all.js
vendored
4
config/env/all.js
vendored
|
@ -45,7 +45,7 @@ module.exports = {
|
||||||
/*
|
/*
|
||||||
* Upload Configuration
|
* Upload Configuration
|
||||||
*/
|
*/
|
||||||
//Global upload path
|
//Global upload path
|
||||||
uploadPath : 'uploads/',
|
uploadPath : 'uploads/',
|
||||||
//PDF storage path
|
//PDF storage path
|
||||||
pdfUploadPath: 'uploads/pdfs/',
|
pdfUploadPath: 'uploads/pdfs/',
|
||||||
|
@ -70,7 +70,7 @@ module.exports = {
|
||||||
js: [
|
js: [
|
||||||
'public/config.js',
|
'public/config.js',
|
||||||
'public/application.js',
|
'public/application.js',
|
||||||
'public/populate_template_cache.js',
|
'public/dist/populate_template_cache.js',
|
||||||
'public/modules/*/*.js',
|
'public/modules/*/*.js',
|
||||||
'public/modules/*/*[!tests]*/*.js'
|
'public/modules/*/*[!tests]*/*.js'
|
||||||
],
|
],
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
module.exports = function(grunt) {
|
module.exports = function(grunt) {
|
||||||
require('jit-grunt')(grunt);
|
require('jit-grunt')(grunt);
|
||||||
|
|
||||||
// Unified Watch Object
|
// Unified Watch Object
|
||||||
var watchFiles = {
|
var watchFiles = {
|
||||||
serverViews: ['app/views/**/*.*'],
|
serverViews: ['app/views/**/*.*'],
|
||||||
|
@ -157,7 +157,7 @@ module.exports = function(grunt) {
|
||||||
src: watchFiles.serverTests,
|
src: watchFiles.serverTests,
|
||||||
options: {
|
options: {
|
||||||
reporter: 'spec',
|
reporter: 'spec',
|
||||||
quiet: false,
|
quiet: false,
|
||||||
require: 'server.js',
|
require: 'server.js',
|
||||||
ui: 'bdd'
|
ui: 'bdd'
|
||||||
}
|
}
|
||||||
|
@ -243,7 +243,7 @@ module.exports = function(grunt) {
|
||||||
},
|
},
|
||||||
main: {
|
main: {
|
||||||
src: ['public/modules/**/views/**.html', 'public/modules/**/views/**/*.html'],
|
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).
|
// Default task(s).
|
||||||
grunt.registerTask('default', ['lint', 'html2js:main', 'env', 'concurrent:default']);
|
grunt.registerTask('default', ['lint', 'html2js:main', 'env', 'concurrent:default']);
|
||||||
|
|
||||||
// Debug task.
|
// Debug task.
|
||||||
grunt.registerTask('debug', ['lint', 'html2js:main', 'concurrent:debug']);
|
grunt.registerTask('debug', ['lint', 'html2js:main', 'concurrent:debug']);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue