Skip to content

Commit

Permalink
Merge pull request #272 from skycoin/develop
Browse files Browse the repository at this point in the history
Merge develop to master
  • Loading branch information
gz-c authored Jan 17, 2019
2 parents 906dd43 + f859e44 commit 78bf53a
Show file tree
Hide file tree
Showing 131 changed files with 102 additions and 7,023 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: go

go:
- "1.9"
- "1.10"
- "1.11.x"

env:
- SKYCOIN_ADDR=http://172.17.0.2:6420
Expand Down
18 changes: 16 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,29 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
### [Unreleased]

### Added

- Add support to ARM architecture in Docker Cloud builds
### Fixed

### Changed

### Removed

## [v0.4.0] - 01-15-2019

### Added

### Fixed

### Changed

### Removed

- Remove `/api/address` endpoint. Use `/api/transactions` instead.
- Remove precompiled `dist/` folder. Users should compile the frontend with `make build-ng` or use a docker image.
- Remove `-use-unversioned-api` option

[Unreleased]: https://github.com/skycoin/skycoin/compare/master...develop
[0.25.0]: https://github.com/skycoin/skycoin/compare/v0.4.0...v0.3.0
78 changes: 44 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,34 @@ You can check blocks, transactions and their states.

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

### Quick reference
# Table of Contents

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

# Table of Contents
- [Installation](#installation)
- [Requirements](#requirements)
- [Go](#go)
- [Angular](#angular)
- [Docker images](#docker-images)
- [API documentation](#api-documentation)
- [Usage](#usage)
- [Run a skycoin node](#run-a-skycoin-node)
- [Build the explorer frontend](#build-the-explorer-frontend)
- [Run the explorer](#run-the-explorer)
- [Development](#development)
- [Compiling the angular frontend](#compiling-the-angular-frontend)
- [Formatting](#formatting)
- [Code Linting](#code-linting)
- [e2e Tests](#e2e-tests)
- [Customization](#customization)
- [Deployment](#deployment)

- [Releases Notes](CHANGELOG.md)
- [Installation](#installation)
- [Requirements](#requirements)
- [Usage](#usage)
- [Run a skycoin node](#run-a-skycoin-node)
- [Run the explorer](#run-the-explorer)
- [Docker images](#docker-images)
- [API documentation](#api-documentation)
- [Development](#development)
- [Compiling the angular frontend](#compiling-the-angular-frontend)
- [Formatting](#formatting)
- [Code Linting](#code-linting)
- [Customization](#customization)
- [Deployment](#deployment)
<!-- /MarkdownTOC -->


# Installation
## Installation

## Requirements
### Requirements

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

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

## Docker images

If you want to run Explorer on Docker refer to [Docker instructions](docker/images/README.md)

## API documentation

HTML documentation:

http://explorer.skycoin.net/api.html

JSON formatted API docs:

http://explorer.skycoin.net/api/docs

## Usage

### Run a skycoin node
Expand All @@ -69,6 +85,14 @@ cd skycoin
./run.sh
```

### Build the explorer frontend

```sh
make build-ng
```

Note: if you do not want to install NPM or build the frontend, you can use a docker image to run the explorer.

### Run the explorer

```sh
Expand All @@ -91,20 +115,6 @@ SKYCOIN_ADDR=http://127.0.0.1:3333 ./explorer
make run-api
```

## Docker images

If you want to run Explorer on Docker refer to [Docker instructions](docker/images/README.md)

## API documentation

HTML documentation:

http://explorer.skycoin.net/api.html

JSON formatted API docs:

http://explorer.skycoin.net/api/docs

## Development

After changing the angular frontend, it should be compiled and committed to the repo.
Expand Down
1 change: 0 additions & 1 deletion dist/0.a76c7ccd3867033d76b2.js

This file was deleted.

Loading

0 comments on commit 78bf53a

Please sign in to comment.