Skip to content

Commit 7131efe

Browse files
committed
Stable Version 2.3.0.
Merged #328
1 parent 8a678e6 commit 7131efe

File tree

10 files changed

+305
-267
lines changed

10 files changed

+305
-267
lines changed

CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
##### 2.3.0 - 15 April 2015
2+
3+
###### Backwards compatible API changes
4+
- #328 - Add support for `js-data-sql` adapter
5+
6+
###### Backwards compatible bug fixes
7+
- #328 - Fixed adapter registration
8+
19
##### 2.2.3 - 08 March 2015
210

311
###### Other

Gruntfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ module.exports = function (grunt) {
104104
},
105105
module: {
106106
loaders: [
107-
{ test: /(src)(.+)\.js$/, exclude: /node_modules/, loader: 'babel-loader?blacklist=useStrict' }
107+
{ test: /(.+)\.js$/, exclude: /node_modules/, loader: 'babel-loader?blacklist=useStrict' }
108108
],
109109
preLoaders: [
110110
{
111-
test: /(src)(.+)\.js$|(test)(.+)\.js$/, // include .js files
111+
test: /(.+)\.js$/, // include .js files
112112
exclude: /node_modules/, // exclude any and all files in the node_modules folder
113113
loader: "jshint-loader?failOnHint=true"
114114
}

bower.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
"angular-mocks-1.3.2": "angular-mocks#1.3.2"
2929
},
3030
"dependencies": {
31-
"js-data": ">=1.1.0",
32-
"angular": ">=1.0.3"
31+
"js-data": ">=1.5.7",
32+
"angular": ">=1.1.0"
33+
},
34+
"resolutions": {
35+
"angular": "1.3.2"
3336
}
3437
}

circle.yml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
general:
2+
branches:
3+
ignore:
4+
- gh-pages # list of branches to ignore
15
dependencies:
26
pre:
37
- bower install

0 commit comments

Comments
 (0)