fixed merge conflicts

README.md

@@ -1,12 +1,14 @@
-NodeForms
+TellForm
 --------
 
+Current stable release: v1.2.1
+
 [![Build Status](https://travis-ci.org/whitef0x0/nodeforms.svg?branch=master)](https://travis-ci.org/whitef0x0/nodeforms)
 [![Dependencies Status](https://david-dm.org/whitef0x0/NodeForms.svg)](https://david-dm.org/whitef0x0/nodeforms)
 [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)
 
 
-NodeForms is an opensource *form builder* built ontop of nodejs that can create stunning forms from PDFs or from scratch
+TellForm is an opensource alternative to *TypeForm* built ontop of nodejs that can create stunning forms from PDFs or from scratch
 
 Currently following features are implemented:
 

app.json

@@ -1,5 +1,5 @@
 {
-  "name": "NodeForms",
+  "name": "TellForm",
   "description": "Beautiful, opensource web forms",
   "repository": "https://github.com/whitef0x0/nodeforms",
   "logo": "https://node-js-sample.herokuapp.com/node.svg",

bower.json

@@ -1,7 +1,7 @@
 {
-  "name": "NodeForm",
-  "description": "PDF generated form builder",
-  "version": "1.1.0",
+  "name": "TellForm",
+  "description": "Opensource alternative to TypeForm",
+  "version": "1.2.1",
   "homepage": "https://github.com/whitef0x0/NodeForms",
   "authors": [
     "David Baldwynn <polydaic@gmail.com> (http://baldwynn.me)"

config/env/all.js

@@ -2,7 +2,7 @@
 
 module.exports = {
 	app: {
-		title: 'NodeForms',
+		title: 'TellForm',
 		description: 'Generate Forms from PDFs',
 		keywords: 'typeform, pdfs, forms, generator, form generator',
 	},

config/env/development.js

@@ -19,7 +19,7 @@ module.exports = {
 		}
 	},
 	app: {
-		title: 'NodeForms'
+		title: 'TellForm'
 	},
 	facebook: {
 		clientID: process.env.FACEBOOK_ID || 'APP_ID',
@@ -47,7 +47,7 @@ module.exports = {
 		callbackURL: '/auth/github/callback'
 	},
 	mailer: {
-		from: process.env.MAILER_FROM || 'no-reply@kioskform.herokuapp.com',
+		from: process.env.MAILER_FROM || 'no-reply@tellform.com',
 		options: {
 			service: process.env.MAILER_SERVICE_PROVIDER || '',
 			auth: {

config/env/production.js

@@ -1,7 +1,7 @@
 'use strict';
 
 module.exports = {
-	baseUrl: 'kioskform.herokuapp.com',
+	baseUrl: 'tellform.com',
 	db: {
 		uri: process.env.MONGOHQ_URL || process.env.MONGOLAB_URI || 'mongodb://' + (process.env.DB_1_PORT_27017_TCP_ADDR || 'localhost') + '/mean',
 		options: {
@@ -19,7 +19,7 @@ module.exports = {
 		}
 	},
 	sessionCookie: {
-		domain: 'kioskform.herokuapp.com'
+		domain: 'tellform.com'
 	},
 	assets: {
 		// lib: {
@@ -65,7 +65,7 @@ module.exports = {
 		callbackURL: '/auth/github/callback'
 	},
 	mailer: {
-		from: process.env.MAILER_FROM || 'no-reply@kioskform.herokuapp.com',
+		from: process.env.MAILER_FROM || 'no-reply@tellform.com',
 		options: {
 			service: process.env.MAILER_SERVICE_PROVIDER || '',
 			auth: {

config/env/test.js

@@ -20,7 +20,7 @@ module.exports = {
 		}
 	},
 	app: {
-		title: 'NodeForms Test'
+		title: 'TellForm Test'
 	},
 	facebook: {
 		clientID: process.env.FACEBOOK_ID || 'APP_ID',

docs/setup_sentry_server.md

@@ -1,7 +1,7 @@
 Installing Sentry Server
 ------------------------
 
-NodeForms is an opensource *form builder* that can create stunning forms from PDFs or from scratch
+TellForm is an opensource *form builder* that can create stunning forms from PDFs or from scratch
 
 ## Before You Begin
 Make sure you understand what sentry server does. You can view documentation for sentry server [here](https://sentry.readthedocs.org/). This document was written for a server running *Ubuntu 14.04 LTS server* (we used Azure).

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "NodeForms",
-  "description": "PDF generated form builder",
-  "version": "1.1.0",
+  "name": "TellForm",
+  "description": "Opensource alternative to TypeForm",
+  "version": "1.2.1",
   "homepage": "https://github.com/whitef0x0/NodeForms",
   "authors": [
     "David Baldwynn <polydaic@gmail.com> (http://baldwynn.me)"