Skip to content
This repository has been archived by the owner on Jul 7, 2024. It is now read-only.
/ Orion Public archive

Commit

Permalink
Merge pull request #187 from Siderus/release/0.9.0
Browse files Browse the repository at this point in the history
Release/0.9.0
  • Loading branch information
kernelwhisperer authored Aug 31, 2018
2 parents 824aeca + cdf828e commit 7e4768b
Show file tree
Hide file tree
Showing 4 changed files with 188 additions and 137 deletions.
4 changes: 2 additions & 2 deletions app/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,8 @@ export function runGarbageCollector () {
*/
export function resolveName (name) {
if (!IPFS_CLIENT) return Promise.reject(ERROR_IPFS_UNAVAILABLE)

return IPFS_CLIENT.name.resolve(name)
const options = { recursive: true }
return IPFS_CLIENT.name.resolve(name, options)
.catch(reportAndReject)
}

Expand Down
2 changes: 1 addition & 1 deletion app/api.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ describe('api.js', () => {
.then(result => {
// assert
expect(result).toBe('ipfs-hash')
expect(resolveNameMock).toHaveBeenCalledWith('fake-name')
expect(resolveNameMock).toHaveBeenCalledWith('fake-name', { recursive: true })
})
})
})
Expand Down
13 changes: 8 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Orion",
"version": "0.8.0-master",
"version": "0.9.0-master",
"env": "development",
"ipfsVersion": "v0.4.17",
"ipfsRepoMigrationsVersion": "v1.4.0",
Expand Down Expand Up @@ -83,10 +83,13 @@
"testURL": "http://localhost/"
},
"build": {
"publish": [{
"provider": "generic",
"url": "https://get.siderus.io/orion"
}],
"electronVersion": "2.0.8",
"publish": [
{
"provider": "generic",
"url": "https://get.siderus.io/orion"
}
],
"appId": "io.siderus.orion",
"files": [
"app/**/*",
Expand Down
Loading

0 comments on commit 7e4768b

Please sign in to comment.