Skip to content

Commit d17d233

Browse files
authored
Merge pull request #300 from skycoin/develop
Merge to master
2 parents 005e024 + 0bb017d commit d17d233

Some content is hidden

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

54 files changed

+6594
-5226
lines changed

.snyk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
2-
version: v1.12.0
3-
ignore: {}
2+
version: v1.13.3
3+
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
4+
ignore:
5+
'npm:shelljs:20140723':
6+
- '*':
7+
reason: No fix available - Dev dependency
8+
expires: 2019-12-31T00:00:00.000Z
49
# patches apply the minimum changes required to fix a vulnerability
510
patch:
611
'npm:debug:20170905':

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: go
2+
dist: xenial
23

34
go:
45
- "1.11.x"

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ You can check blocks, transactions and their states.
3333
- [e2e Tests](#e2e-tests)
3434
- [Customization](#customization)
3535
- [Deployment](#deployment)
36+
- [Translations](#translations)
3637

3738
<!-- /MarkdownTOC -->
3839

@@ -190,3 +191,7 @@ Run it on port 80:
190191
```sh
191192
EXPLORER_HOST=:80 ./explorer
192193
```
194+
195+
#### Translations
196+
197+
You can find information about how to work with translation files in the [Translations README](/src/assets/i18n/README.md).

e2e/block-details/block-details.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class BlockDetailsPage {
4545
return element
4646
.all(by.css('.header-container > div > a'))
4747
.get(index)
48-
.element(by.css('.-not-xs'))
48+
.element(by.css('.btn-text-e2e'))
4949
.getAttribute('textContent');
5050
}
5151

e2e/search/search.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { browser, by, element, protractor } from 'protractor';
22

33
export class SearchPage {
44
search(text: string) {
5-
return element(by.css('.-search-bar-container input')).sendKeys(
5+
return element(by.css('.search-bar-container input')).sendKeys(
66
text,
77
protractor.Key.ENTER
88
);

0 commit comments

Comments
 (0)