Merge pull request #2 from rodrigogs/2.0

2.0 merge
rodrigogs · Mar 28, 2016 · cb9ecb9 · cb9ecb9
2 parents f478eb0 + df94335
commit cb9ecb9
Show file tree

Hide file tree

Showing 26 changed files with 3,381 additions and 1,845 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -5,6 +5,11 @@ engines:
     enabled: true
   eslint:
     enabled: true
+    checks:
+      complexity:
+        enabled: false
+      max-statements:
+        enabled: false
   fixme:
     enabled: true
   duplication:

diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@
 bower_components
 
 node_modules
+/coverage
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "kairos",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "A non date-based time calculator",
   "homepage": "https://github.com/kairos",
   "repository": {
@@ -29,7 +29,7 @@
     "test"
   ],
   "devDependencies": {
-    "mocha": "~2.3.4",
+    "mocha": "~2.4.5",
     "assert": "~0.1.0"
   }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,4 @@
		bower_components

		node_modules
		/coverage