Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
davesag committed Aug 14, 2018
2 parents 4bfda63 + 2a7d6fa commit 3552fd5
Show file tree
Hide file tree
Showing 3 changed files with 562 additions and 460 deletions.
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ Jose-Simple allows the encryption and decryption of data using the JOSE (JSON Ob

It depends on [`node-jose`](https://github.com/cisco/node-jose) by Cisco.

Requires Node 8.11.2 (LTS) or better. Works fine under Node 10+
Requires Node 8.11.3 (LTS) or better. Works fine under Node 10+

* `develop` - [![CircleCI](https://circleci.com/gh/davesag/jose-simple/tree/develop.svg?style=svg)](https://circleci.com/gh/davesag/jose-simple/tree/develop) [![codecov](https://codecov.io/gh/davesag/jose-simple/branch/develop/graph/badge.svg)](https://codecov.io/gh/davesag/jose-simple)
* `master` - [![CircleCI](https://circleci.com/gh/davesag/jose-simple/tree/master.svg?style=svg)](https://circleci.com/gh/davesag/jose-simple/tree/master) [![codecov](https://codecov.io/gh/davesag/jose-simple/branch/master/graph/badge.svg)](https://codecov.io/gh/davesag/jose-simple)
| Branch | Status | Coverage | Comment |
| ------ | ------ | -------- | ------- |
| `develop` | [![CircleCI](https://circleci.com/gh/davesag/jose-simple/tree/develop.svg?style=svg)](https://circleci.com/gh/davesag/jose-simple/tree/develop) | [![codecov](https://codecov.io/gh/davesag/jose-simple/branch/develop/graph/badge.svg)](https://codecov.io/gh/davesag/jose-simple) | Work in progress |
| `master` | [![CircleCI](https://circleci.com/gh/davesag/jose-simple/tree/master.svg?style=svg)](https://circleci.com/gh/davesag/jose-simple/tree/master) | [![codecov](https://codecov.io/gh/davesag/jose-simple/branch/master/graph/badge.svg)](https://codecov.io/gh/davesag/jose-simple) | Latest release |

## Installation

Expand Down Expand Up @@ -45,7 +47,7 @@ Requires Node 8.11.2 (LTS) or better. Works fine under Node 10+

### Prerequisites

* [NodeJS](https://nodejs.org)`brew install nvm` then `nvm use 10.3.0`
* [NodeJS](https://nodejs.org)`brew install nvm` then `nvm use 10.8.0`

### Test it

Expand Down
Loading

0 comments on commit 3552fd5

Please sign in to comment.