Merge pull request #280 from jakerella/prep-for-v2.1.1

jakerella · jakerella · commit 8f9981dd673d · 2016-02-07T17:54:43.000-05:00
v2.1.1 Bug fix release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2016-02-07 v2.1.1
+	* Reorganize test cases into separate files for ease of maintenance and testing
+	* Fix #86: JSONP return data treated as JSON
+	* Added jQuery 1.12.0 to test quite
+	* Fix #105: Using XML files as proxies
+	* Fix #267: Handle undefined URL argument correctly
+	* Fix #123: Handle query string formatted data option
+
 ## 2016-01-23
     * Updated to version 2.1.0
     * Removed unused testswarm files
diff --git a/dist/jquery.mockjax.js b/dist/jquery.mockjax.js
@@ -1,7 +1,7 @@
 /*! jQuery Mockjax
  * A Plugin providing simple and flexible mocking of ajax requests and responses
  * 
- * Version: 2.1.0
+ * Version: 2.1.1
  * Home: https://github.com/jakerella/jquery-mockjax
  * Copyright (c) 2016 Jordan Kasper, formerly appendTo;
  * NOTE: This repository was taken over by Jordan Kasper (@jakerella) October, 2014
diff --git a/dist/jquery.mockjax.min.js b/dist/jquery.mockjax.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jquery-mockjax",
   "title": "jQuery Mockjax",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "main": "./src/jquery.mockjax.js",
   "description": "The jQuery Mockjax Plugin provides a simple and extremely flexible interface for mocking or simulating ajax requests and responses.",
   "url": "https://github.com/jakerella/jquery-mockjax",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*! jQuery Mockjax`
`2`	`2`	`* A Plugin providing simple and flexible mocking of ajax requests and responses`
`3`	`3`	`*`
`4`		`- * Version: 2.1.0`
	`4`	`+ * Version: 2.1.1`
`5`	`5`	`* Home: https://github.com/jakerella/jquery-mockjax`
`6`	`6`	`* Copyright (c) 2016 Jordan Kasper, formerly appendTo;`
`7`	`7`	`* NOTE: This repository was taken over by Jordan Kasper (@jakerella) October, 2014`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "jquery-mockjax",`
`3`	`3`	`"title": "jQuery Mockjax",`
`4`		`- "version": "2.1.0",`
	`4`	`+ "version": "2.1.1",`
`5`	`5`	`"main": "./src/jquery.mockjax.js",`
`6`	`6`	`"description": "The jQuery Mockjax Plugin provides a simple and extremely flexible interface for mocking or simulating ajax requests and responses.",`
`7`	`7`	`"url": "https://github.com/jakerella/jquery-mockjax",`