Merge branch 'release/0.3.7'

Author: dalelotts

Gruntfile.js

@@ -48,7 +48,7 @@ module.exports = function (grunt) {
       options: {
         thresholds: {
           'statements': 100,
-          'branches': 98,
+          'branches': 96.9,
           'lines': 100,
           'functions': 100
         },

README.md

@@ -1,4 +1,4 @@
-# Angular bootstrap date & time picker version: 0.3.6
+# Angular bootstrap date & time picker version: 0.3.7
 ================================
 
 Native AngularJS datetime picker directive styled by Twitter Bootstrap 3

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "This directive allows you to add a datetime-picker to your form.",
   "author": "https://github.com/dalelotts/angular-bootstrap-datetimepicker/graphs/contributors",
   "license": "MIT",

gulpfile.js

@@ -23,7 +23,11 @@ gulp.task('complexity', function () {
 });
 
 gulp.task('test', function (done) {
-  karma.start({configFile: karmaConfig, singleRun: true}, done);
+  karma.start({
+    configFile: karmaConfig,
+    singleRun: true,
+    reporters: ['progress', 'coverage', 'threshold']
+  }, done);
 });
 
 gulp.task('tdd', function (done) {

karma.conf.js

@@ -27,8 +27,8 @@ module.exports = function (config) {
       'karma-chrome-launcher',
       'karma-firefox-launcher',
       'karma-phantomjs-launcher',
-      'karma-coverage'
-      // 'karma-threshold-reporter'
+      'karma-coverage',
+      'karma-threshold-reporter'
     ],
 
     files: paths.all,
@@ -56,7 +56,7 @@ module.exports = function (config) {
     // the configure thresholds
     thresholdReporter: {
       statements: 100,
-      branches: 100,
+      branches: 96.9,
       functions: 100,
       lines: 100
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-bootstrap-datetimepicker",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "This directive allows you to add a datetime-picker to your form elements.",
   "author": "https://github.com/dalelotts/ng-bootstrap-datetimepicker/graphs/contributors",
   "bugs": {
@@ -27,9 +27,8 @@
     "karma-chrome-launcher": "^0.1.5",
     "karma-coverage": "^0.2.1",
     "karma-firefox-launcher": "^0.1.3",
-    "karma-jasmine": "^0.2.3",
-    "karma-phantomjs-launcher": "^0.1.2",
-    "karma-threshold-reporter": "^0.1.9",
+    "karma-jasmine": "^0.2.3",                            "karma-phantomjs-launcher": "^0.1.2",
+    "karma-threshold-reporter": "^0.1.12",
     "matchdep": "^0.3.0",
     "phantomjs": "^1.9.12"
   },

src/css/datetimepicker.css

@@ -1,5 +1,5 @@
 /**
- * @license angular-bootstrap-datetimepicker  version: 0.3.6
+ * @license angular-bootstrap-datetimepicker  version: 0.3.7
  * (c) 2013-2014 Knight Rider Consulting, Inc. http://www.knightrider.com
  * License: MIT
  */