merged stage into master

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

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

config/socket.io.js

@@ -10,8 +10,9 @@ var config = require('./config'),
 module.exports = function (app, db) {
 	var server = http.createServer(app);
 
-	// Create a new Socket.io server
-	var io = socketio.listen(server);
+	var io = socketio(config.socketPort, { transports: ['websocket', 'polling'] });
+	var redis = require('socket.io-redis');
+	io.adapter(redis({ host: '127.0.0.1', port: 6379 }));
 
 	// Add an event listener to the 'connection' event
 	io.on('connection', function (socket) {

package.json

@@ -84,6 +84,7 @@
     "raven": "^0.9.0",
     "soap": "^0.11.0",
     "socket.io": "^1.4.6",
+    "socket.io-redis": "^1.0.0",
     "swig": "~1.4.1"
   },
   "devDependencies": {

public/dist/application.js

@@ -727,14 +727,22 @@ angular.module('core').service('Menus', [
 			socket: null
 		};
 
+<<<<<<< HEAD
 		console.log('https://'+window.location.hostname+':'+$window.socketPort);
 		connect('https://'+window.location.hostname+':'+$window.socketPort);
+=======
+		connect(window.location.protocol+'//'+window.location.hostname+':'+$window.socketPort);
+>>>>>>> stage
 
 		return service;
 
 		// Connect to Socket.io server
 		function connect(url) {
+<<<<<<< HEAD
 			service.socket = io();
+=======
+			service.socket = io({'transports': ['websocket', 'polling']});
+>>>>>>> stage
 		}
 
 		// Wrap the Socket.io 'emit' method
@@ -1115,7 +1123,10 @@ angular.module('forms').controller('SubmitFormController', ['$scope', '$rootScop
 		// Create a controller method for sending visitor data
 		function send(form, lastActiveIndex, timeElapsed) {
 
+<<<<<<< HEAD
 			console.log(lastActiveIndex);
+=======
+>>>>>>> stage
 			// Create a new message object
 			var visitorData = {
 				referrer: document.referrer,
@@ -1137,7 +1148,11 @@ angular.module('forms').controller('SubmitFormController', ['$scope', '$rootScop
 		var service = {
 			send: send
 		};
+<<<<<<< HEAD
 		
+=======
+
+>>>>>>> stage
 		init();
 		return service;
 

public/modules/core/services/socket.io.client.service.js

@@ -17,14 +17,13 @@
 			socket: null
 		};
 
-		console.log('https://'+window.location.hostname+':'+$window.socketPort);
-		connect('https://'+window.location.hostname+':'+$window.socketPort);
+		connect(window.location.protocol+'//'+window.location.hostname+':'+$window.socketPort);
 
 		return service;
 
 		// Connect to Socket.io server
 		function connect(url) {
-			service.socket = io();
+			service.socket = io(url, {'transports': ['websocket', 'polling']});
 		}
 
 		// Wrap the Socket.io 'emit' method

public/modules/forms/base/views/directiveViews/field/dropdown.html~HEAD

@@ -0,0 +1,27 @@
+<div class="field row dropdown" ng-click="setActiveField(field._id, index, true)" ng-if="field.fieldOptions.length > 0">
+    <div class="col-xs-12 field-title" ng-style="{'color': design.colors.questionColor}">
+	    <h3>
+	    	<span class="fa fa-angle-double-right"></span>
+	    	{{field.title}}
+	    	<span class="required-error" ng-show="!field.required">{{ 'OPTIONAL' | translate }}</span>
+	    </h3>
+    </div>
+    <div class="col-xs-12 field-input ">
+		<ui-select ng-model="field.fieldValue"
+                theme="selectize"
+				ng-model-options="{ debounce: 250 }"
+				ng-required="field.required"
+				ng-disabled="field.disabled"
+				ng-focus="setActiveField(field._id, index, true)">
+			<ui-select-match placeholder="Type or select an option">
+				{{$select.selected.option_value}}
+			</ui-select-match>
+			<ui-select-choices
+                repeat="option in field.fieldOptions | filter: $select.search"
+				ng-class="{'active': option.option_value === field.fieldValue }">
+				<span ng-bind-html="option.option_value | highlight: $select.search"></span>
+			</ui-select-choices>
+        </ui-select>
+    </div>
+</div>
+<br>

public/modules/forms/directives/analytics-service.client.directive.js

@@ -13,7 +13,6 @@
 		// Create a controller method for sending visitor data
 		function send(form, lastActiveIndex, timeElapsed) {
 
-			console.log(lastActiveIndex);
 			// Create a new message object
 			var visitorData = {
 				referrer: document.referrer,
@@ -35,7 +34,7 @@
 		var service = {
 			send: send
 		};
-		
+
 		init();
 		return service;