Merge branch 'master' into 2.20

app/views/form.server.view.pug

@@ -57,7 +57,7 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
     //Embedding socketUrl
     if socketUrl
       script(type='text/javascript').
-        socketUrl = !{socketUrl}
+        socketUrl = "!{socketUrl}"
 
     script(src='/static/lib/jquery/dist/jquery.min.js', type='text/javascript')
     link(rel='stylesheet', href='/static/lib/font-awesome/css/font-awesome.min.css')
@@ -79,9 +79,9 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
     //Socket.io Client Dependency
     script(src='/static/lib/socket.io-client/dist/socket.io.min.js')
     script(src='/static/lib/jquery-ui/jquery-ui.js', type='text/javascript')
-    script(src='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js', integrity='sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa', crossorigin='anonymous')
 
     //Minified Bower Dependencies
+    script(src='/static/lib/angular/angular.min.js')
     script(src='/static/dist/vendor.min.js')
     script(src='/static/lib/angular-ui-date/src/date.js', type='text/javascript')
 

gruntfile.js

@@ -151,8 +151,8 @@ module.exports = function(grunt) {
 			},
 			production: {
 				files: {
-					'public/dist/application.js': ['public/application.js', 'public/config.js', 'public/form_modules/**/*.js'],
-					'public/dist/form_application.js': ['public/form-application.js', 'public/form-config.js', 'public/form_modules/**/*.js']
+					'public/dist/application.js': '<%= applicationJavaScriptFiles %>',
+					'public/dist/form-application.js': '<%= formApplicationJavaScriptFiles %>'
 				}
 			}
 		},
@@ -287,7 +287,7 @@ module.exports = function(grunt) {
     grunt.registerTask('coverage:server', ['env:test', 'mocha_istanbul:coverageServer']);
 
 	// Default task(s).
-	grunt.registerTask('default', ['lint', 'html2js:main', 'html2js:forms', 'env', 'concurrent:default']);
+	grunt.registerTask('default', ['lint', 'loadConfig', 'ngAnnotate', 'uglify', 'html2js:main', 'html2js:forms', 'env', 'concurrent:default']);
 	grunt.registerTask('dev', ['lint', 'html2js:main',  'html2js:forms', 'env:dev', 'concurrent:default']);
 
 	// Debug task.

package.json

@@ -27,7 +27,6 @@
   },
   "dependencies": {
     "async": "^1.4.2",
-    "bcrypt": "~1.0.3",
     "body-parser": "~1.14.1",
     "bower": "~1.6.5",
     "chalk": "^1.1.3",
@@ -74,9 +73,7 @@
     "socket.io": "^1.4.6",
     "socket.io-redis": "^1.0.0",
     "uuid-token-generator": "^0.5.0",
-    "wildcard-subdomains": "github:tellform/wildcard-subdomains",
-    "winston": "^2.3.1",
-    "winston-logrotate": "^1.2.0"
+    "winston": "^2.3.1"
   },
   "devDependencies": {
     "all-contributors-cli": "^4.3.0",

public/form_modules/forms/base/views/directiveViews/field/dropdown.html

@@ -26,8 +26,7 @@
 				ng-change="nextField()">
 			<ui-select-match placeholder="{{ 'OPTION_PLACEHOLDER' | translate }}">
 			</ui-select-match>
-			<ui-select-choices repeat="option in field.fieldOptions | filter: $select.search"
-							   ng-class="{'active': option.option_value === field.fieldValue }">
+			<ui-select-choices repeat="option in field.fieldOptions | filter: $select.search">
 				<span ng-bind-html="option.option_value | highlight: $select.search"></span>
 			</ui-select-choices>
         </ui-select>