Merge pull request #255 from skycoin/develop

Merge to master
skycoin · Dec 21, 2018 · 0887a62 · 0887a62
2 parents c93371a + b2c1010
commit 0887a62
Show file tree

Hide file tree

Showing 102 changed files with 1,570 additions and 1,455 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: go
 
 go:
-  - "1.8"
   - "1.9"
   - "1.10"
 
@@ -28,6 +27,7 @@ install:
 
 script:
   - make check
+  - make lint-ts
   - make build-ng
   - make check-ui
 

diff --git a/Makefile b/Makefile
@@ -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

diff --git a/README.md b/README.md
@@ -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)

diff --git a/dist/0.4ff8f23d9b9631142fe3.js b/dist/0.4ff8f23d9b9631142fe3.js
diff --git a/dist/0.a76c7ccd3867033d76b2.js b/dist/0.a76c7ccd3867033d76b2.js
diff --git a/dist/1.b2f032c505a19c32b77a.js b/dist/1.b2f032c505a19c32b77a.js
diff --git a/dist/3rdpartylicenses.txt b/dist/3rdpartylicenses.txt
@@ -252,6 +252,10 @@ [email protected]
 MIT
 MIT
 
+[email protected]
+MIT
+MIT
+
 [email protected]
 Apache-2.0
 Apache License

diff --git a/dist/assets/i18n/en.json b/dist/assets/i18n/en.json
@@ -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...",
@@ -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",
@@ -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"
@@ -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"

diff --git a/dist/assets/i18n/es.json b/dist/assets/i18n/es.json
diff --git a/dist/fa-brands-400.e29e9563cff9c09a6ac5.svg → dist/fa-brands-400.8f8fac65806eec82b4e0.svg b/dist/fa-brands-400.e29e9563cff9c09a6ac5.svg → dist/fa-brands-400.8f8fac65806eec82b4e0.svg
diff --git a/dist/fa-regular-400.576b41bc58d121b9d4e5.svg → dist/fa-regular-400.649582a6076b3294a23d.svg b/dist/fa-regular-400.576b41bc58d121b9d4e5.svg → dist/fa-regular-400.649582a6076b3294a23d.svg
diff --git a/dist/fa-solid-900.11c05d473f66db7ce479.svg → dist/fa-solid-900.0f8d20430f5091676681.svg b/dist/fa-solid-900.11c05d473f66db7ce479.svg → dist/fa-solid-900.0f8d20430f5091676681.svg
diff --git a/dist/index.html b/dist/index.html
@@ -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>
diff --git a/dist/main.52f02b008b476795176d.js b/dist/main.52f02b008b476795176d.js
diff --git a/dist/main.777200dacbc172066b57.js b/dist/main.777200dacbc172066b57.js
diff --git a/dist/polyfills.12d3c9408de2dd329676.js → dist/polyfills.ca68d4f1fe57f99ee635.js b/dist/polyfills.12d3c9408de2dd329676.js → dist/polyfills.ca68d4f1fe57f99ee635.js
diff --git a/dist/runtime.97dea39f4edef38a5bc7.js b/dist/runtime.97dea39f4edef38a5bc7.js
diff --git a/dist/runtime.ed5a0820d42a3eed7a53.js b/dist/runtime.ed5a0820d42a3eed7a53.js
diff --git a/dist/scripts.6f2bd7e3fcf43ee87c2f.js → dist/scripts.e0f4a942c9ea3a773769.js b/dist/scripts.6f2bd7e3fcf43ee87c2f.js → dist/scripts.e0f4a942c9ea3a773769.js