Skip to content
This repository was archived by the owner on Apr 11, 2019. It is now read-only.

Commit f84cc32

Browse files
committed
Merge branch 'release/1.0.0-alpha.7' into develop
2 parents aacc6ba + 1640b08 commit f84cc32

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Code Climate](https://codeclimate.com/github/jakubrohleder/angular-jsonapi/badges/gpa.svg)](https://codeclimate.com/github/jakubrohleder/angular-jsonapi)
44

5-
## Use with caution it's only 1.0.0-alpha.6
5+
## Use with caution it's only 1.0.0-alpha.7
66

77
*This module is still in a WIP state, many things work fine but it lacks tests and API may change, also documentation can not reflect the real state*
88

@@ -56,7 +56,7 @@ The future development plan involves:
5656
- [1.0.0-alpha.4 (done)](#100-alpha4-done)
5757
- [1.0.0-alpha.5 (done)](#100-alpha5-done)
5858
- [1.0.0-alpha.6 (done)](#100-alpha6-done)
59-
- [1.0.0-alpha.7 (in progress)](#100-alpha7-in-progress)
59+
- [1.0.0-alpha.7 (done)](#100-alpha7-done)
6060
- [1.0.0-alpha.*](#100-alpha)
6161
- [1.0.0-beta.1](#100-beta1)
6262
- [1.0.0-beta.2](#100-beta2)
@@ -757,7 +757,7 @@ Adds each error to `errorsObject.errors[key]`.
757757
## 1.0.0-alpha.6 (done)
758758
* [x] Fix bugs introduced by previous version
759759
760-
## 1.0.0-alpha.7 (in progress)
760+
## 1.0.0-alpha.7 (done)
761761
* [x] fix for one side relationships
762762
* [x] fix for collection.pristine
763763
* [x] Parse.com source alpha

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-jsonapi",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"main": "dist/angular-jsonapi.js",
55
"dependencies": {
66
"angular": "1.4.x",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-jsonapi",
3-
"version": "1.0.0-alpha.6",
3+
"version": "1.0.0-alpha.7",
44
"dependencies": {},
55
"scripts": {
66
"test": "gulp test"

0 commit comments

Comments
 (0)