Merge tag '0.6.1'

0.6.1 Conflicts: dist/techan.js dist/techan.min.js dist/techan.min.js.map package.json
jasoven · Sep 7, 2016 · 50f18ca · 50f18ca
2 parents ca83164 + 8c99dee
commit 50f18ca
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -240,6 +240,7 @@ module.exports = function(grunt) {
   grunt.registerTask('minify', ['uglify', 'karma:minify']);
   grunt.registerTask('serve', ['bower', 'clean', 'filegen:version', 'examples', 'test', 'connect', 'karma:watch:start', 'watch']);
   grunt.registerTask('release:pre', ['bump-only:prerelease', 'default']);
+  grunt.registerTask('release:patch', ['bump-only:patch', 'default', 'bump-commit']);
   grunt.registerTask('release:minor', ['bump-only:minor', 'default', 'bump-commit']);
   grunt.registerTask('release:major', ['bump-only:major', 'default', 'bump-commit']);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,24 @@
 {
   "name": "techan",
   "version": "0.7.0-3",
+  "description": "A visual, technical analysis and charting (Candlestick, OHLC, indicators) library built on D3.",
+  "keywords": [
+    "technical analysis",
+    "financial",
+    "finance",
+    "visualization",
+    "chart",
+    "svg",
+    "candlestick",
+    "ohlc",
+    "indicators",
+    "volume"
+  ],
+  "homepage": "techanjs.org",
+  "author": {
+    "name": "André Dumas",
+    "url": "http://andredumas.id.au"
+  },
   "main": "dist/techan.js",
   "repository": {
     "type": "git",