fixed merged

modified:   public/modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html

README.md

@@ -36,7 +36,9 @@ TellForm is an *opensource alternative to TypeForm* built ontop of nodejs that c
 	-Save form submissions as FDF-formatted PDFs (unstable)
 	-Toggle forms as private (viewable only if logged in as Form's user) or public (viewable by anyone)
 	-Drag and drop functionality to editing form field order
-	-Editable form submissions (half-done)
+	-Viewable form submissions 
+	-Google Analytics Support
+	-In-app Analytics (dropoff rate of fields, conversion rate, etc)
 
 ###TODO:
 	-Implement encryption for all form data
@@ -44,13 +46,14 @@ TellForm is an *opensource alternative to TypeForm* built ontop of nodejs that c
 	-Add Typeform API integration
 	-Add plugin/3rd party integration support (ala Slack)
 	-Create wiki for easy installation and setup
-	-Create mockups for different user view designs
 
 
 
 
 ## Quickstart
 
+Before you start, make sure you have Redis installed and running at 127.0.0.1:6379
+
 Install dependencies first.
 ```bash
 $ npm install
@@ -161,8 +164,12 @@ After you've generated the key and certificate, place them in the *config/sslcer
 
 [Samuel Laulhau](https://github.com/lalop)
 
+[Arun Pattnaik](https://github.com/arunpattnaik)
+
 ## Mentions on the Web
 
+[Mister Ad](http://start.mister-ad.biz/newsticker/open-source-alternative-zu-typeform-tellform-in-der-kurzvorstellung/)
+
 [t3n.de](http://t3n.de/news/open-source-alternative-typeform-tellform-707295/)
 
 [BootCSS Expo](http://expo.bootcss.com/)

app/controllers/users/users.authentication.server.controller.js

@@ -51,7 +51,9 @@ var config_nev = function () {
 
 	}, function(err, options){
 		if(err) throw err;
-		nev.generateTempUserModel(User);
+		nev.generateTempUserModel(User, function(){
+			return;
+		});
 	});
 };
 

public/modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html

@@ -111,9 +111,10 @@
 					<th class="scope">
 						{{$index+1}}
 					</th>
+
 					<td data-ng-repeat="field in row.form_fields">
 						<span ng-if="field.fieldValue == 'dropdown'">
-							{{field.fieldValue.option_value}}
+							{{field.fieldValue}}
 						</span>
 						<span ng-if="field.fieldValue != 'dropdown'">
 							{{field.fieldValue}}

public/modules/forms/views/directiveViews/form/submit-form.client.view.html

@@ -65,7 +65,7 @@ ng-style="{'color':button.color}">
 <div class="row form-actions" id="submit_field"
 	ng-class="{activeField: selected._id == 'submit_field' }"
 	ng-style="{ 'background-color':myform.design.colors.buttonColor}"
-	style="border-top: 1px solid #ddd; margin-right: -13%; margin-left: -13%; padding-bottom: 100vh;">
+	style="border-top: 1px solid #ddd; margin-right: -13%; margin-left: -13%; margin-top: 30vh; height: 100vh">
 
 	<div class="col-xs-12 text-left"
 		 style="background-color:#990000; color:white;"