bump version 1.2.6 (support angularjs 1.2.x)

hueitan · hueitan · commit 5165ddf17c1a · 2014-11-14T14:27:10.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+14 Nov 2014 v1.2.6
+===
+**Important**
+    
+This version support to angularjs version 1.2.x <br/>
+To support angularjs version 1.3.x, please use angular-validation 1.3.x
+    
+**Fix**
+
+[bcaab7e](https://github.com/huei90/angular-validation/commit/bcaab7e31f2e00e92e2d8e8397935c96c37d16b3) Custom message on html not displaying with multiple validator
+
 24 Aug 2014 v1.2.5
 ===
 **New Features**
@@ -109,4 +120,4 @@ Include bower.json
 [51f0019](https://github.com/huei90/angular-validation/commit/51f0019477a1ec459edfea4b2966bd6a16b2a348) provider `validate` `reset` doesn't need parameter `scope` anymore
 
 27 Dec 2013 v1.0.0 FIRST RELEASE
-===
+===
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -81,9 +81,6 @@ module.exports = function(grunt) {
         karma: {
             angular1_2: {
                 configFile: 'config/karma.conf.angular.1.2.js'
-            },
-            angular1_3: {
-                configFile: 'config/karma.conf.angular.1.3.js'
             }
         }
     });
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-angular-validation 1.2.5
+angular-validation 1.2.6
 =========================
 [![NPM version](https://badge.fury.io/js/angular-validation.svg)](http://badge.fury.io/js/angular-validation)
 [![Build Status](https://travis-ci.org/huei90/angular-validation.png?branch=master)](https://travis-ci.org/huei90/angular-validation)
@@ -9,10 +9,14 @@ Client-side Validation should be simple and clean.
 <br/>Don't let Client-side Validation dirty your controller.
 <br/>Setup your Validation on config phase by using some rules [(example)](https://github.com/huei90/angular-validation/blob/master/dist/angular-validation-rule.js)
 <br/>And add Validation in your view only.
+    
+angularjs 1.2.0 support to version angular-validation 1.2.6 <br/>
+angularjs 1.3.0 support after version angular-validation 1.3.0
 
 Requirement
 -----
-[AngularJS](http://angularjs.org) > 1.2.0, > 1.3.0
+[AngularJS](http://angularjs.org) > 1.2.0 (for angular-validation < 1.2.6) <br/>
+[AngularJS](http://angularjs.org) > 1.3.0 (for angular-validation > 1.3)
 
 DEMO
 -----
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-validation",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "homepage": "https://github.com/huei90/angular-validation",
   "authors": [
     "huei90"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-validation",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Client-side Validation for AngularJS",
   "repository": {
     "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,6 @@ module.exports = function(grunt) {`
`81`	`81`	`karma: {`
`82`	`82`	`angular1_2: {`
`83`	`83`	`configFile: 'config/karma.conf.angular.1.2.js'`
`84`		`- },`
`85`		`- angular1_3: {`
`86`		`- configFile: 'config/karma.conf.angular.1.3.js'`
`87`	`84`	`}`
`88`	`85`	`}`
`89`	`86`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-validation",`
`3`		`- "version": "1.2.5",`
	`3`	`+ "version": "1.2.6",`
`4`	`4`	`"homepage": "https://github.com/huei90/angular-validation",`
`5`	`5`	`"authors": [`
`6`	`6`	`"huei90"`