Skip to content

Commit

Permalink
Merge pull request #255 from skycoin/develop
Browse files Browse the repository at this point in the history
Merge to master
  • Loading branch information
gz-c authored Dec 21, 2018
2 parents c93371a + b2c1010 commit 0887a62
Show file tree
Hide file tree
Showing 102 changed files with 1,570 additions and 1,455 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: go

go:
- "1.8"
- "1.9"
- "1.10"

Expand All @@ -28,6 +27,7 @@ install:

script:
- make check
- make lint-ts
- make build-ng
- make check-ui

Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ install-linters: ## Install linters
format: ## Formats the code. Must have goimports installed (use make install-linters).
goimports -w explorer.go

lint-ts: ## runs ts lint
npm run lint

check-ui: ## runs e2e tests connecting to a containerized node
go run explorer.go &>/dev/null &
sleep 10
Expand Down
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,22 @@ Run linters:
make lint
```

### e2e Tests

If you are running a Skycoin node normally, you can run the e2e tests with:

```sh
npm run e2e
```

If you are running a Skycoin node using the test database (`blockchain-180.db`), you can run the e2e tests with:

```sh
npm run e2e-blockchain-180
```

The second method is the one used in Travis.

### Customization

[CUSTOMIZATION.md](CUSTOMIZATION.md)
Expand Down
1 change: 0 additions & 1 deletion dist/0.4ff8f23d9b9631142fe3.js

This file was deleted.

1 change: 1 addition & 0 deletions dist/0.a76c7ccd3867033d76b2.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion dist/1.b2f032c505a19c32b77a.js

This file was deleted.

4 changes: 4 additions & 0 deletions dist/3rdpartylicenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,10 @@ scrollingelement@1.5.2
MIT
MIT

bignumber.js@7.2.1
MIT
MIT

tslib@1.9.3
Apache-2.0
Apache License
Expand Down
24 changes: 16 additions & 8 deletions dist/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
"coinIdentifier": "SKY",
"address": "Address",
"coins": "Coins",
"iniialHours": "Initial Hours",
"calculatedHours": "Final Hours",
"currentHours": "Current Hours",
"hours": "Hours",
"loadingMsg": "Loading...",
"shortLoadingErrorMsg": "Loading error",
"longLoadingErrorMsg": "Error loading data, try again later...",
Expand All @@ -15,12 +19,13 @@
"outputs": "Outputs",
"pending": "pending",
"date": "Date",
"balance": "Balance",
"initialBalance": "Initial address balance",
"finalBalance": "Final address balance",
"initialBalanceShort": "Initial",
"finalBalanceShort": "Final",
"firstSeen": "First seen at"
"balance": "More info",
"fee": "Transaction fee (in hours)",
"initialBalance": "Initial coins balance",
"finalBalance": "Final coins balance",
"firstSeen": "First seen at",
"loadAll": "Show all {{total}} elements",
"loading": "Loading, please wait..."
},
"blocks": {
"blocksTitle": "Blocks",
Expand Down Expand Up @@ -55,7 +60,9 @@
"title": "Address",
"txsNumber": "# of Transactions",
"totalReceived": "Total Received",
"currentBalance": "Current Balance",
"totalSent": "Total Sent",
"currentBalance": "Current Coins",
"hoursBalance": "Current Hours",
"tools": "Tools",
"unspentOutputs": "Unspent outputs",
"withoutTransactions": "Without transactions"
Expand All @@ -64,7 +71,8 @@
"title": "Unspent Outputs",
"address": "Address",
"outputsNumber": "# of outputs",
"total": "Total",
"totalCoins": "Total Coins",
"totalHours": "Total Hours",
"origin": "Origin",
"date": "Date",
"withoutOutputs": "Without outputs"
Expand Down
94 changes: 0 additions & 94 deletions dist/assets/i18n/es.json

This file was deleted.

File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="assets/styles.css" type="text/css" rel="stylesheet" media="screen,projection"/>
<link rel="icon" type="image/x-icon" href="favicon.ico"/>
<link rel="stylesheet" href="styles.a0c197555364952712a7.css"></head>
<link rel="stylesheet" href="styles.940d1608daba3d77dcc9.css"></head>
<body>
<app-root></app-root>
<script type="text/javascript" src="runtime.ed5a0820d42a3eed7a53.js"></script><script type="text/javascript" src="polyfills.12d3c9408de2dd329676.js"></script><script type="text/javascript" src="scripts.6f2bd7e3fcf43ee87c2f.js"></script><script type="text/javascript" src="main.777200dacbc172066b57.js"></script></body>
<script type="text/javascript" src="runtime.97dea39f4edef38a5bc7.js"></script><script type="text/javascript" src="polyfills.ca68d4f1fe57f99ee635.js"></script><script type="text/javascript" src="scripts.e0f4a942c9ea3a773769.js"></script><script type="text/javascript" src="main.52f02b008b476795176d.js"></script></body>
</html>
1 change: 1 addition & 0 deletions dist/main.52f02b008b476795176d.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/main.777200dacbc172066b57.js

This file was deleted.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/runtime.97dea39f4edef38a5bc7.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion dist/runtime.ed5a0820d42a3eed7a53.js

This file was deleted.

File renamed without changes.
Loading

0 comments on commit 0887a62

Please sign in to comment.