Skip to content

Commit

Permalink
new links and small fix for macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
igorls committed Oct 3, 2018
1 parent 33880b2 commit 21a3f8f
Show file tree
Hide file tree
Showing 7 changed files with 132 additions and 81 deletions.
16 changes: 8 additions & 8 deletions README.md
Expand Up @@ -59,14 +59,14 @@ Your private keys are stored locally only and are properly encrypted with a user
Off-chain information (such as the Block Producer standard) are fetched via a proxy server provided by EOS Rio, to avoid malformed json data and third-party servers misconfigurations.

## Download a pre-compiled build
- [Windows](https://github.com/eosrio/simpleos/releases/download/v0.6.4/simpleos-setup-0.6.4.exe)
- `f8402bd807e0708ed28ceb554d146c7e3d72a64db3bc1837a907b3086fb4fb03 simpleos-setup-0.6.4.exe`
- [MacOS](https://github.com/eosrio/simpleos/releases/download/v0.6.4/simpleos-0.6.4.dmg)
- `82040b00b75d510650a29a078b1b94df471ec4bdec33092b557c9ef1b71cfce6 simpleos-0.6.4.dmg`
- [Linux AppImage](https://github.com/eosrio/simpleos/releases/download/v0.6.4/simpleos-0.6.4-x86_64.AppImage)
- `f9a374cdbb5bcaa3ec23a7db28b8cd236c7d47db1679f39d524aea29a72031ac simpleos-0.6.4-x86_64.AppImage`
- [Linux DEB](https://github.com/eosrio/simpleos/releases/download/v0.6.4/simpleos_0.6.4_amd64.deb)
- `137839622a94ce54f4b45a0de055db918102f76af22e736278c52dcbcdaf8e86 simpleos_0.6.4_amd64.deb`
- [Windows](https://github.com/eosrio/simpleos/releases/download/v0.6.9/simpleos.Setup.0.6.9.exe)
- `e38306e9566d436d303a4b1ea98a76b946112df428bcba54f65820d1f02c7208 simpleos.Setup.0.6.9.exe`
- [MacOS](https://github.com/eosrio/simpleos/releases/download/v0.6.9/simpleos-0.6.9.dmg)
- `253a12d6fc7e149922b4931faf2257d5025eedd9f5e8a7d9a42494b5e9750fb4 simpleos-0.6.9.dmg`
- [Linux AppImage](https://github.com/eosrio/simpleos/releases/download/v0.6.9/simpleos-0.6.9-x86_64.AppImage)
- `ad0e0d74f92d43473f41d22b8d5448f45a8efb2eb6b4fec6e3a87610da79eeda simpleos-0.6.9-x86_64.AppImage`
- [Linux DEB](https://github.com/eosrio/simpleos/releases/download/v0.6.9/simpleos_0.6.9_amd64.deb)
- `10191d3752303487dbf41d5bdb34b696024647e520cbc20b197ba15693583b44 simpleos_0.6.9_amd64.deb`

## Legal Disclaimer

Expand Down
13 changes: 7 additions & 6 deletions index.js
Expand Up @@ -22,7 +22,8 @@ function createWindow() {
width: 1440,
height: 800,
minWidth: 800,
minHeight: 600,
minHeight: 600,
backgroundColor: '#222222',
frame: true,
icon: path.join(__dirname, 'src/assets/icons/ico/simpleos.ico')
});
Expand All @@ -33,11 +34,11 @@ function createWindow() {
electron: require(`${__dirname}/node_modules/electron`)
});
win.loadURL('http://localhost:7777');
} else {
win.loadURL(url.format({
pathname: path.join(__dirname, 'ng-dist', 'index.html'),
protocol: 'file:',
slashes: true
} else {
win.loadURL(url.format({
pathname: path.join(__dirname, 'ng-dist/index.html'),
protocol: 'file:',
slashes: true
}));
}

Expand Down
172 changes: 108 additions & 64 deletions ng-dist/3rdpartylicenses.txt
Expand Up @@ -330,6 +330,30 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

ws@3.3.3
MIT
The MIT License (MIT)

Copyright (c) 2011 Einar Otto Stangvik <einaros@gmail.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

engine.io-client@3.2.1
MIT
(The MIT License)
Expand All @@ -355,27 +379,6 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

util@0.10.4
MIT
Copyright Joyent, Inc. and other Node contributors. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.

crypto-js@3.1.9-1
MIT
# License
Expand Down Expand Up @@ -497,27 +500,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

assert@1.4.1
MIT
Copyright Joyent, Inc. and other Node contributors. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.

has-binary2@1.0.3
MIT
The MIT License (MIT)
Expand Down Expand Up @@ -602,6 +584,30 @@ trademarks does not indicate endorsement of the trademark holder by Font
Awesome, nor vice versa. **Please do not use brand logos for any purpose except
to represent the company, product, or service to which they refer.**

ultron@1.1.1
MIT
The MIT License (MIT)

Copyright (c) 2015 Unshift.io, Arnout Kazemier, the Contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

yeast@0.1.2
MIT
The MIT License (MIT)
Expand Down Expand Up @@ -638,6 +644,17 @@ MIT
MIT
MIT

async-limiter@1.0.0
MIT
The MIT License (MIT)
Copyright (c) 2017 Samuel Reed <samuel.trace.reed@gmail.com>

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

ms@2.0.0
MIT
The MIT License (MIT)
Expand Down Expand Up @@ -705,24 +722,6 @@ MIT
MIT
MIT

inherits@2.0.3
ISC
The ISC License

Copyright (c) Isaac Z. Schlueter

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.

parseqs@0.0.5
MIT
The MIT License (MIT)
Expand Down Expand Up @@ -911,6 +910,55 @@ MIT
MIT
MIT

safe-buffer@5.1.2
MIT
The MIT License (MIT)

Copyright (c) Feross Aboukhadijeh

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

xmlhttprequest-ssl@1.5.5
MIT
Copyright (c) 2010 passive.ly LLC

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

to-array@0.1.4
MIT
Copyright (c) 2012 Raynos.
Expand Down Expand Up @@ -1103,10 +1151,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

has-cors@1.1.0
MIT
MIT

arraybuffer.slice@0.0.7
MIT
Copyright (C) 2013 Rase-
Expand Down
2 changes: 1 addition & 1 deletion ng-dist/main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ng-dist/vendor.js

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions package.json
Expand Up @@ -82,6 +82,12 @@
"icon": "src/favicon.ico"
}
},
"files": [
"*.js",
"build",
"Ng-dist",
"node_modules"
],
"devDependencies": {
"@angular-devkit/build-angular": "^0.6.8",
"@angular/cli": "^6.2.1",
Expand Down
2 changes: 1 addition & 1 deletion src/app/dashboard/acc_resources/resources.component.ts
Expand Up @@ -484,7 +484,7 @@ export class ResourcesComponent implements OnInit {
checkSellBytes() {
if (this.ramMarketFormSell.value.sellBytes > 0) {
console.log(this.ram_quota);
if(this.ram_quota > (this.ramMarketFormSell.get('sellBytes').value) * 1024) {
if((this.ram_quota-this.ram_usage) > (this.ramMarketFormSell.get('sellBytes').value) * 1024) {
this.ramMarketFormSell.controls['sellBytes'].setErrors(null);
this.ramMarketFormSell.controls['sellEos'].setErrors(null);
this.errormsgeos = '';
Expand Down

0 comments on commit 21a3f8f

Please sign in to comment.