Skip to content
This repository was archived by the owner on Sep 5, 2020. It is now read-only.

Commit

Permalink
Merge branch 'develop' of github.com:ethereum/mist into circle-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
evertonfraga committed Jun 29, 2018
2 parents 826bcee + 66c0b12 commit ad2c224
Show file tree
Hide file tree
Showing 190 changed files with 29,070 additions and 36,853 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": ["es2016-node5"]
"presets": ["react", "es2016-node5"]
}
6 changes: 3 additions & 3 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ engines:
config:
languages:
javascript:
mass_threshold: 40 ## default threshold
mass_threshold: 40 # default threshold
eslint:
enabled: true
channel: "eslint-3" ## required for airbnb-base config
channel: "eslint-4"
checks:
complexity:
enabled: true
csslint:
enabled: true

ratings: ## enables GPA rating
ratings: # enables GPA rating
paths:
- "**.css"
- "**.js"
Expand Down
17 changes: 0 additions & 17 deletions .editorconfig

This file was deleted.

1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
node_modules
interface/client/lib/signatures.js
29 changes: 29 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"env": { "es6": true },
"extends": [
"plugin:prettier/recommended",
"eslint:recommended",
"plugin:react/recommended"
],
"globals": {
"i18n": true,
"mist": true,
"beforeEach": true,
"LocalStore": true,
"web3": true,
"Tabs": true,
"Tracker": true,
"_": true,
"window": true,
"location": true,
"document": true,
"Promise": true,
"require": true,
"global": true,
"store": true,
"exports": true,
"module": true,
"console": true,
"process": true
}
}
47 changes: 0 additions & 47 deletions .eslintrc.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
- [ ] I've asked for help in the [Mist Gitter](http://gitter.im/ethereum/mist) before filing this issue.


<!-- Please fill in these information below: -->

```
Version: `0.0.0`
OS & Version: windows/linux/osx
Node version: `geth 0.0.0`
Node version: `geth 0.0.0`
Number of blocks synchronized: 0
```

Expand Down
4 changes: 2 additions & 2 deletions .github/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
maintainers:
- alexvandesande
- evertonfraga
- ryanio
- marcgarreau
- alexvandesande
- philipplgh
- ryanio
13 changes: 13 additions & 0 deletions .github/no-response.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Configuration for probot-no-response - https://github.com/probot/no-response

# Number of days of inactivity before an Issue is closed for lack of response
daysUntilClose: 7
# Label requiring a response
responseRequiredLabel: "Status: Information needed"
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
closeComment: >
This issue has been automatically closed because there has been no response
to our request for more information from the original author. With only the
information that is currently in the issue, we don't have enough information
to take action. Please reach out if you have or find the answers we need so
that we can investigate further.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ nodes/geth/
config.json
mist.log
npm-debug.log
/yarn.lock
yarn-debug.log
yarn-error.log
wallet
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.4
8.2.1
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
interface/.meteor
tests/mocha-in-browser/lib
dist_mist
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
singleQuote: true
17 changes: 11 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ branches:
only:
- develop
- master
- /^greenkeeper/.*$/

matrix:
include:
Expand Down Expand Up @@ -67,7 +68,7 @@ install:
- echo $PATH
- PATH=$PATH:$HOME/.meteor && curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/1390e0f96162d0d70fc1e60a6b0f4f891a0e8f42/configure.sh | /bin/sh
- export PATH=$PATH:`yarn global bin`
- yarn global add gulp-cli meteor-build-client [email protected].2
- yarn global add gulp-cli meteor-build-client [email protected].4
- yarn

script:
Expand All @@ -82,20 +83,24 @@ script:
# build mist
- if [[ $GULP_PLATFORM == "mac" ]]; then travis_wait 60 gulp --$GULP_PLATFORM; fi # increase timeout for slower mac builds
- if [[ $GULP_PLATFORM != "mac" ]]; then gulp --$GULP_PLATFORM; fi

# assert creation of Mist artifacts
- gulp verify-artifacts --mist --$GULP_PLATFORM

# build wallet if on master branch
# build wallet if on master branch
- if [[ $TRAVIS_BRANCH == "master" ]]; then travis_wait 60 gulp --wallet --$GULP_PLATFORM; fi

# debug purposes - see what builds were successfully created
- ls -la ~/build/ethereum/mist/dist_mist/dist
# assert creation of Wallet artifacts
- if [[ $TRAVIS_BRANCH == "master" ]]; then gulp verify-artifacts --wallet --$GULP_PLATFORM; fi

# prepare integration tests
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start; sleep 3; fi

# currently, tests should run in linux and mac
- if [[ $GULP_PLATFORM != "win" ]]; then gulp test; fi

after_success:
- if [[ $TRAVIS_BRANCH == "master" ]]; then gulp uploadQueue --$GULP_PLATFORM && gulp uploadQueue --wallet --$GULP_PLATFORM; fi
- if [[ $TRAVIS_BRANCH == "master" ]]; then gulp upload-queue --$GULP_PLATFORM && gulp upload-queue --wallet --$GULP_PLATFORM; fi


notifications:
Expand Down
38 changes: 17 additions & 21 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@ If you see someone who is making an extra effort to ensure our community is welc

The following behaviors are expected and requested of all community members:

* Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
* Exercise consideration and respect in your speech and actions.
* Attempt collaboration before conflict.
* Refrain from demeaning, discriminatory, or harassing behavior and speech.
* Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
* Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
- Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
- Exercise consideration and respect in your speech and actions.
- Attempt collaboration before conflict.
- Refrain from demeaning, discriminatory, or harassing behavior and speech.
- Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
- Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.

## 4. Unacceptable Behavior

The following behaviors are considered harassment and are unacceptable within our community:

* Violence, threats of violence or violent language directed against another person.
* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
* Posting or displaying sexually explicit or violent material.
* Posting or threatening to post other people’s personally identifying information ("doxing").
* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
* Inappropriate photography or recording.
* Inappropriate physical contact. You should have someone’s consent before touching them.
* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
* Deliberate intimidation, stalking or following (online or in person).
* Advocating for, or encouraging, any of the above behavior.
* Sustained disruption of community events, including talks and presentations.
- Violence, threats of violence or violent language directed against another person.
- Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
- Posting or displaying sexually explicit or violent material.
- Posting or threatening to post other people’s personally identifying information ("doxing").
- Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
- Inappropriate photography or recording.
- Inappropriate physical contact. You should have someone’s consent before touching them.
- Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
- Deliberate intimidation, stalking or following (online or in person).
- Advocating for, or encouraging, any of the above behavior.
- Sustained disruption of community events, including talks and presentations.

## 5. Consequences of Unacceptable Behavior

Expand All @@ -55,16 +55,12 @@ If a community member engages in unacceptable behavior, the community organizers

If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. [email protected].



Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.

## 7. Addressing Grievances

If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify the Mist team with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.



## 8. Scope

We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues–online and in-person–as well as in all one-on-one communications pertaining to community business.
Expand Down
8 changes: 3 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,20 @@

To help improve Mist (_Ethereum Wallet_), please include the following:

- What do you run? (_Binary version from [releases](https://github.com/ethereum/mist/releases) or a development version from the [commandline](https://github.com/ethereum/mist#run-mist)_)
- What do you run? (_Binary version from [releases](https://github.com/ethereum/mist/releases) or a development version from the [commandline](https://github.com/ethereum/mist#run-mist)_)
- Which version do you use? (_Check the `VERSION` file in the Mist folder_)
- What OS you're on?

If applicable:

- Log file (Linux: `~/.config/Mist/*.log`, Windows: `%APPDATA%/Roaming/Mist/*.log`, MacOSX: `~/Library/Application Support/Mist/*.log`)
- Log file (Linux: `~/.config/Mist/logs/all.log`, Windows: `%APPDATA%/Roaming/Mist/logs/all.log`, MacOSX: `~/Library/Application Support/Mist/logs/all.log`)
- Screenshot (for GUI related issues)


## Pull Requests

If you want to make a PR please make sure you add a understandable description of what it is you're adding/changing/fixing.

For formatting we use 4 *spaces* as indentation.
For formatting we use 2 _spaces_ as indentation.

If you add any modules or files, please give them a module description and or a class description:

Expand All @@ -40,4 +39,3 @@ Provides an API for all dapps, which specifically targets features from the Mist
@constructor
*/
```

Loading

0 comments on commit ad2c224

Please sign in to comment.