Merge branch '2.20' into fixSlowAnalyticsBug

.gitignore

@@ -1,14 +1,10 @@
 dist
 .vagrant
 npm-debug.*
-docs/Oscar_Credentials.md
 scripts/test_oscarhost.js
-scripts/oscarhost/private/
 coverage/
 e2e_coverage/
-uploads/
 app/e2e_tests/screeshots/*
-tmp
 
 # iOS / Apple
 # ===========
@@ -25,6 +21,7 @@ Oscar_Credentials.*
 npm-debug.log
 node_modules/
 public/lib/
+public/dist
 app/tests/coverage/
 .bower-*/
 .idea/

README.md

@@ -4,7 +4,7 @@ TellForm 2.1.0
 [![Build Status](https://travis-ci.org/tellform/tellform.svg?branch=master)](https://travis-ci.org/tellform/tellform)
 ![Project Status](https://img.shields.io/badge/status-2.1.0-green.svg)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3491e86eb7194308b8fc80711d736ede)](https://www.codacy.com/app/david-baldwin/tellform?utm_source=github.com&utm_medium=referral&utm_content=tellform/tellform&utm_campaign=Badge_Grade)
-[![Gitter](https://badges.gitter.im/tellform/tellform.svg)](https://gitter.im/tellform/tellform?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gitter](https://badges.gitter.im/tellform/Lobby.svg)](https://gitter.im/tellform/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 > An *opensource alternative to TypeForm* that can create [stunning mobile-ready forms](https://tellform.com/examples) , surveys and questionnaires.
 
@@ -119,14 +119,7 @@ Your application should run on port 3000 or the port you specified in your .env
 
 To deploy with docker, first install docker [here](https://docs.docker.com/engine/installation/).
 
-Then run these commands
-
-```
-$ docker run -p 27017:27017 -d --name some-mongo mongo
-$ docker run -p 127.0.0.1:6379:6379 -d --name some-redis redis
-$ docker run --rm -p 3000:3000 --link some-redis:redis-db --link some-mongo:db -e "SUBDOMAINS_DISABLED=TRUE" -e "DISABLE_CLUSTER_MODE=TRUE" -e "MAILER_EMAIL_ID=<YourEmailAPI_ID>" -e "MAILER_FROM=<noreply@yourdomain.com>" -e "MAILER_SERVICE_PROVIDER=<YourEmailAPIProvider>"  -e "MAILER_PASSWORD=<YourAPIKey>" -e "BASE_URL=localhost" -p 80:80 tellform/development
-```
-
+Then see this page [here](https://tellform.com/install_docker) for commands on how to deploy your own local TellForm instance.
 
 ## Testing Your Application
 You can run the full test suite included with TellForm with the test task:
@@ -201,7 +194,7 @@ TellForm's configuration is done with environment variables. To set an option fo
 
 ## Where to get help
 
-[Gitter Chat](https://gitter.im/tellform/tellform)
+[Gitter Chat](https://gitter.im/tellform/Lobby)
 
 [Official Twitter](https://twitter.com/tellform_real)
 

app/models/user.server.model.js

@@ -9,7 +9,8 @@ var mongoose = require('mongoose'),
 	config = require('../../config/config'),
 	timeStampPlugin = require('../libs/timestamp.server.plugin'),
 	path = require('path'),
-	querystring = require('querystring');
+	querystring = require('querystring'),
+	constants = require('../libs/constants');
 
 /**
  * User Schema

app/views/layout.server.view.pug

@@ -51,7 +51,7 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
 
     block content
 
-    script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','{{google_analytics_id}}','auto');ga('send','pageview')
+    script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','#{google_analytics_id}','auto');ga('send','pageview')
     
     script(src='https://www.google-analytics.com/analytics.js', async='', defer='')
 

config/env/production.js

@@ -28,9 +28,8 @@ module.exports = {
 		domain: process.env.BASE_URL || '.tellform.com'
 	},
 	assets: {
-		bower_js: 'public/dist/vendor.min.js',
-		css: 'public/dist/application.min.css',
-		js: 'public/dist/application.min.js',
-		form_js: 'public/dist/form-application.min.js'
+		css: ['public/dist/application.min.css'],
+		js: ['public/dist/application.min.js', 'public/dist/populate_template_cache.js'],
+		form_js: ['public/dist/form-application.min.js', 'public/dist/form_populate_template_cache.js', 'public/dist/form-vendor.min.js']
 	}
 };

gruntfile.js

@@ -123,7 +123,7 @@ module.exports = function(grunt) {
 					compress: true
 				},
 				files: {
-					'public/dist/vendor.min.js': bowerArray
+					'public/dist/form-vendor.min.js': bowerArray
 				}
 			}
 		},

public/modules/core/config/core.client.routes.js

@@ -20,14 +20,9 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope'
 				state: fromState,
 				params: fromParams
 			}
-
-<<<<<<< HEAD
-			var statesToIgnore = ['home', 'signin', 'resendVerifyEmail', 'verify', 'signup', 'signup-success', 'forgot', 'reset-invalid', 'reset', 'reset-success'];
 			
-=======
 			var statesToIgnore = ['', 'home', 'signin', 'resendVerifyEmail', 'verify', 'signup', 'signup-success', 'forgot', 'reset-invalid', 'reset', 'reset-success'];
 
->>>>>>> 2.20
 			//Redirect to listForms if user is authenticated
 			if(statesToIgnore.indexOf(toState.name) > 0){
 				if(Auth.isAuthenticated()){

public/modules/forms/admin/services/form-fields.client.service.js

@@ -1,18 +1,11 @@
 'use strict';
 
 //TODO: DAVID: URGENT: Make this a $resource that fetches valid field types from server
-<<<<<<< HEAD
-angular.module('forms').service('FormFields', [ '$rootScope', '$translate', '$window',
-	function($rootScope, $translate, $window) {
-		console.log($window.user);
-		$translate.use($window.user.language);
-=======
 angular.module('forms').service('FormFields', [ '$rootScope', '$translate', 'Auth',
 	function($rootScope, $translate, Auth) {
 
 		var language = Auth.ensureHasCurrentUser().language;
 		$translate.use(language);
->>>>>>> 2.20
 
 		this.types = [
 		    {

public/modules/forms/forms.client.module.js

@@ -3,10 +3,6 @@
 // Use Application configuration module to register a new module
 ApplicationConfiguration.registerModule('forms', [
 	'ngFileUpload', 'ui.date', 'ui.sortable',
-<<<<<<< HEAD
 	'angular-input-stars', 'users', 'ngclipboard', 'textAngular',
 	'frapontillo.bootstrap-switch'
-=======
-	'angular-input-stars', 'users', 'ngclipboard'
->>>>>>> 2.20
 ]);//, 'colorpicker.module' @TODO reactivate this module