chore(pre-release): Release pre-release 4.

Includes new Changelog format and added grunt-conventional-changelog. Must use correct commit format for these to show up though.
textAngular · Oct 6, 2014 · efccc19 · efccc19
1 parent fb20887
commit efccc19
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -8,10 +8,11 @@ module.exports = function (grunt) {
 	grunt.loadNpmTasks('grunt-istanbul-coverage');
 	grunt.loadNpmTasks('grunt-karma');
 	grunt.loadNpmTasks('grunt-karma-coveralls');
+	grunt.loadNpmTasks('grunt-conventional-changelog');
 
 	// Default task.
-	grunt.registerTask('default', ['uglify', 'cssmin', 'clean', 'test']);
-	grunt.registerTask('test', ['jshint', 'karma', 'coverage']);
+	grunt.registerTask('default', ['uglify', 'cssmin', 'test']);
+	grunt.registerTask('test', ['clean', 'jshint', 'karma', 'coverage']);
 	grunt.registerTask('travis-test', ['jshint', 'karma', 'coverage', 'coveralls']);
 
 	var testConfig = function (configFile, customOptions) {
@@ -22,6 +23,7 @@ module.exports = function (grunt) {
 
 	// Project configuration.
 	grunt.initConfig({
+		changelog: {optios: {dest: 'changelog.md'}},
 		clean: ["coverage"],
 		coverage: {
 		  options: {
@@ -82,6 +84,7 @@ module.exports = function (grunt) {
 					'dist/textAngular.min.css': ['src/textAngular.css']
 				}
 			}
-		}
+		},
+
 	});
 };
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "textAngular",
-  "version": "1.3.0-pre3",
+  "version": "1.3.0-pre4",
   "main": ["./src/textAngular.js", "./src/textAngularSetup.js", "./src/textAngular.css"],
   "description": "A radically powerful Text-Editor/Wysiwyg editor for Angular.js",
   "keywords": [

diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,25 @@
-###Changelog
+<a name="1.3.0-pre4"></a>
+### 1.3.0-pre4 (2014-10-06)
+
+
+#### Bug Fixes
+
+* **taTools:** Fixes the wordcount to count correctly. ([fb208874](http://github.com/fraywing/textAngular/commit/fb208874a53abd2bea7c4f7fedd260dcee489141))
+
+
+<a name="1.3.0-pre3"></a>
+### 1.3.0-pre3 (2014-10-06)
+
+
+<a name="1.3.0-pre2"></a>
+### 1.3.0-pre2 (2014-10-06)
+
+
+<a name="1.3.0-pre1"></a>
+### 1.3.0-pre1 (2014-10-06)
+
+
+###OLD Changelog - PRE v1.3.0-pre1
 
 2014-07-26 v1.2.2
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "textAngular",
   "filename": "textAngular.min.js",
-  "version": "1.3.0-pre3",
+  "version": "1.3.0-pre4",
   "description": "A radically powerful Text-Editor/Wysiwyg editor for Angular.js",
   "maintainers": [
     {
@@ -29,6 +29,7 @@
     "grunt-contrib-cssmin": "^0.10.0",
     "grunt-contrib-jshint": "^0.8.0",
     "grunt-contrib-uglify": "^0.2.7",
+    "grunt-conventional-changelog": "^1.1.0",
     "grunt-istanbul-coverage": "~0.0.2",
     "grunt-karma": "^0.6.2",
     "grunt-karma-coveralls": "^2.5.0",