Skip to content

Commit

Permalink
Merge pull request #300 from skycoin/develop
Browse files Browse the repository at this point in the history
Merge to master
  • Loading branch information
gz-c authored May 14, 2019
2 parents 005e024 + 0bb017d commit d17d233
Show file tree
Hide file tree
Showing 54 changed files with 6,594 additions and 5,226 deletions.
9 changes: 7 additions & 2 deletions .snyk
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.12.0
ignore: {}
version: v1.13.3
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
'npm:shelljs:20140723':
- '*':
reason: No fix available - Dev dependency
expires: 2019-12-31T00:00:00.000Z
# patches apply the minimum changes required to fix a vulnerability
patch:
'npm:debug:20170905':
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: go
dist: xenial

go:
- "1.11.x"
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ You can check blocks, transactions and their states.
- [e2e Tests](#e2e-tests)
- [Customization](#customization)
- [Deployment](#deployment)
- [Translations](#translations)

<!-- /MarkdownTOC -->

Expand Down Expand Up @@ -190,3 +191,7 @@ Run it on port 80:
```sh
EXPLORER_HOST=:80 ./explorer
```

#### Translations

You can find information about how to work with translation files in the [Translations README](/src/assets/i18n/README.md).
2 changes: 1 addition & 1 deletion e2e/block-details/block-details.po.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export class BlockDetailsPage {
return element
.all(by.css('.header-container > div > a'))
.get(index)
.element(by.css('.-not-xs'))
.element(by.css('.btn-text-e2e'))
.getAttribute('textContent');
}

Expand Down
2 changes: 1 addition & 1 deletion e2e/search/search.po.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { browser, by, element, protractor } from 'protractor';

export class SearchPage {
search(text: string) {
return element(by.css('.-search-bar-container input')).sendKeys(
return element(by.css('.search-bar-container input')).sendKeys(
text,
protractor.Key.ENTER
);
Expand Down
Loading

0 comments on commit d17d233

Please sign in to comment.