This repository was archived by the owner on Sep 5, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of github.com:ethereum/mist into circle-ci
- Loading branch information
Showing
190 changed files
with
29,070 additions
and
36,853 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"presets": ["es2016-node5"] | ||
"presets": ["react", "es2016-node5"] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
node_modules | ||
interface/client/lib/signatures.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
maintainers: | ||
- alexvandesande | ||
- evertonfraga | ||
- ryanio | ||
- marcgarreau | ||
- alexvandesande | ||
- philipplgh | ||
- ryanio |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,4 +11,6 @@ nodes/geth/ | |
config.json | ||
mist.log | ||
npm-debug.log | ||
/yarn.lock | ||
yarn-debug.log | ||
yarn-error.log | ||
wallet |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
7.4 | ||
8.2.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
interface/.meteor | ||
tests/mocha-in-browser/lib | ||
dist_mist |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
singleQuote: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,7 @@ branches: | |
only: | ||
- develop | ||
- master | ||
- /^greenkeeper/.*$/ | ||
|
||
matrix: | ||
include: | ||
|
@@ -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: | ||
|
@@ -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: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
||
|
@@ -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. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.