Skip to content

Commit 78bf53a

Browse files
authored
Merge pull request #272 from skycoin/develop
Merge develop to master
2 parents 906dd43 + f859e44 commit 78bf53a

File tree

131 files changed

+102
-7023
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+102
-7023
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
language: go
22

33
go:
4-
- "1.9"
5-
- "1.10"
4+
- "1.11.x"
65

76
env:
87
- SKYCOIN_ADDR=http://172.17.0.2:6420

CHANGELOG.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,29 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7-
## [Unreleased]
7+
### [Unreleased]
88

99
### Added
1010

11-
- Add support to ARM architecture in Docker Cloud builds
11+
### Fixed
12+
13+
### Changed
14+
15+
### Removed
16+
17+
## [v0.4.0] - 01-15-2019
18+
19+
### Added
1220

1321
### Fixed
1422

1523
### Changed
1624

1725
### Removed
1826

27+
- Remove `/api/address` endpoint. Use `/api/transactions` instead.
28+
- Remove precompiled `dist/` folder. Users should compile the frontend with `make build-ng` or use a docker image.
29+
- Remove `-use-unversioned-api` option
30+
31+
[Unreleased]: https://github.com/skycoin/skycoin/compare/master...develop
32+
[0.25.0]: https://github.com/skycoin/skycoin/compare/v0.4.0...v0.3.0

README.md

Lines changed: 44 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,34 @@ You can check blocks, transactions and their states.
1212

1313
[https://explorer.skycoin.net](https://explorer.skycoin.net)
1414

15-
### Quick reference
15+
# Table of Contents
1616

17-
- **Where to file issues**:
18-
[https://github.com/skycoin/skycoin-explorer/issues](https://github.com/skycoin/skycoin-explorer/issues)
17+
<!-- MarkdownTOC levels="1,2,3,4,5" autolink="true" bracket="round" -->
1918

20-
# Table of Contents
19+
- [Installation](#installation)
20+
- [Requirements](#requirements)
21+
- [Go](#go)
22+
- [Angular](#angular)
23+
- [Docker images](#docker-images)
24+
- [API documentation](#api-documentation)
25+
- [Usage](#usage)
26+
- [Run a skycoin node](#run-a-skycoin-node)
27+
- [Build the explorer frontend](#build-the-explorer-frontend)
28+
- [Run the explorer](#run-the-explorer)
29+
- [Development](#development)
30+
- [Compiling the angular frontend](#compiling-the-angular-frontend)
31+
- [Formatting](#formatting)
32+
- [Code Linting](#code-linting)
33+
- [e2e Tests](#e2e-tests)
34+
- [Customization](#customization)
35+
- [Deployment](#deployment)
2136

22-
- [Releases Notes](CHANGELOG.md)
23-
- [Installation](#installation)
24-
- [Requirements](#requirements)
25-
- [Usage](#usage)
26-
- [Run a skycoin node](#run-a-skycoin-node)
27-
- [Run the explorer](#run-the-explorer)
28-
- [Docker images](#docker-images)
29-
- [API documentation](#api-documentation)
30-
- [Development](#development)
31-
- [Compiling the angular frontend](#compiling-the-angular-frontend)
32-
- [Formatting](#formatting)
33-
- [Code Linting](#code-linting)
34-
- [Customization](#customization)
35-
- [Deployment](#deployment)
37+
<!-- /MarkdownTOC -->
3638

3739

38-
# Installation
40+
## Installation
3941

40-
## Requirements
42+
### Requirements
4143

4244
```
4345
go>=1.10
@@ -59,6 +61,20 @@ After cloning the project, you will need to run `npm install` to pull in all jav
5961

6062
The angular code is compiled to the `dist/` folder.
6163

64+
## Docker images
65+
66+
If you want to run Explorer on Docker refer to [Docker instructions](docker/images/README.md)
67+
68+
## API documentation
69+
70+
HTML documentation:
71+
72+
http://explorer.skycoin.net/api.html
73+
74+
JSON formatted API docs:
75+
76+
http://explorer.skycoin.net/api/docs
77+
6278
## Usage
6379

6480
### Run a skycoin node
@@ -69,6 +85,14 @@ cd skycoin
6985
./run.sh
7086
```
7187

88+
### Build the explorer frontend
89+
90+
```sh
91+
make build-ng
92+
```
93+
94+
Note: if you do not want to install NPM or build the frontend, you can use a docker image to run the explorer.
95+
7296
### Run the explorer
7397

7498
```sh
@@ -91,20 +115,6 @@ SKYCOIN_ADDR=http://127.0.0.1:3333 ./explorer
91115
make run-api
92116
```
93117

94-
## Docker images
95-
96-
If you want to run Explorer on Docker refer to [Docker instructions](docker/images/README.md)
97-
98-
## API documentation
99-
100-
HTML documentation:
101-
102-
http://explorer.skycoin.net/api.html
103-
104-
JSON formatted API docs:
105-
106-
http://explorer.skycoin.net/api/docs
107-
108118
## Development
109119

110120
After changing the angular frontend, it should be compiled and committed to the repo.

dist/0.a76c7ccd3867033d76b2.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)