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

Updates master with 0.9.3 changes #3305

Merged
merged 22 commits into from
Nov 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ad87311
apply EthBlocks.init fix
skubakdj Aug 16, 2017
0c0fc91
Create CODE_OF_CONDUCT.md
evertonfraga Oct 17, 2017
25eda86
Catalan language support.
nigeon Oct 19, 2017
22862b2
Merge pull request #3184 from nigeon/develop
evertonfraga Oct 21, 2017
25f5404
Merge pull request #3179 from ethereum/add-code-of-conduct-1
evertonfraga Oct 21, 2017
e597068
Merge pull request #2955 from skubakdj/ethblocks-fix
evertonfraga Oct 21, 2017
c27ed2e
Typo fixed [ci skip]
Nov 4, 2017
10712e6
Updating 4byte signatures
evertonfraga Nov 9, 2017
c44891e
Adding ethereumjs-util
evertonfraga Nov 9, 2017
ad3c0e2
Overriding eth_getTransactionReceipt call
evertonfraga Nov 9, 2017
a071c0d
update solc
wjmelements Nov 11, 2017
5a0fe8c
Merge pull request #3263 from ethereum/update-signatures
evertonfraga Nov 13, 2017
b986c1b
Merge pull request #3274 from wjmelements/solc-0.4.18
evertonfraga Nov 13, 2017
6abecb1
Prevents duplicate Dynamic View entries
wolovim Nov 15, 2017
a8a9b54
Merge pull request #3288 from ethereum/loki-dupes
evertonfraga Nov 15, 2017
bde4200
Merge pull request #3246 from myforx/develop
evertonfraga Nov 15, 2017
3d64052
Auto-generating SHA256 checksums
evertonfraga Nov 15, 2017
c623b6d
Formatting checksum table contents
evertonfraga Nov 15, 2017
ed1578a
Merge pull request #3291 from ethereum/checksums-in-sha256
evertonfraga Nov 16, 2017
c58353f
Merge pull request #3265 from ethereum/transactionReceipt-injection
evertonfraga Nov 16, 2017
71e4763
Version bump
evertonfraga Nov 20, 2017
a6c288e
Merge branch 'master' into develop
evertonfraga Nov 21, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# Code of Conduct

## 1. Purpose

A primary goal of Mist project is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).

This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.

We invite all those who participate in Mist project to help us create safe and positive experiences for everyone.

## 2. Open Source Citizenship

A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.

Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.

If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, we want to know.

## 3. Expected Behavior

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.

## 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.

## 5. Consequences of Unacceptable Behavior

Unacceptable behavior from any community member, including sponsors and those with decision-making authority, will not be tolerated.

Anyone asked to stop unacceptable behavior is expected to comply immediately.

If a community member engages in unacceptable behavior, the community organizers may take any action they deem appropriate, up to and including a temporary ban or permanent expulsion from the community without warning (and without refund in the case of a paid event).

## 6. Reporting Guidelines

If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. ev@ethereum.org.



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 code of conduct and its related procedures also applies to unacceptable behavior occurring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members.

## 9. Contact info

ev@ethereum.org

## 10. License and attribution

This Code of Conduct is distributed under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).

Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).

Retrieved on November 22, 2016 from [http://citizencodeofconduct.org/](http://citizencodeofconduct.org/)
23 changes: 13 additions & 10 deletions gulpTasks/publishing.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,11 @@ gulp.task('checksums', (cb) => {
let command;
let argument = '';

switch (process.platform) {
case 'darwin':
command = 'md5';
break;
case 'win32':
if (process.platform === 'win32') {
command = 'certUtil -hashfile';
argument = 'md5';
break;
default:
command = 'md5sum';
argument = 'SHA256';
} else {
command = 'shasum -a 256';
}

files.forEach((file) => {
Expand Down Expand Up @@ -90,14 +85,22 @@ gulp.task('upload-binaries', (cb) => {
})
// append checksums to draft text
.then(() => {
console.info('Appending checksums to release notes...', checksums);
if (draft.body && checksums) {
got.patch(`https://api.github.com/repos/ethereum/mist/releases/${draft.id}?access_token=${GITHUB_TOKEN}`, {
body: JSON.stringify({
tag_name: `v${version}`,
body: `${draft.body}\n\n## Checksums\n\`\`\`\n${checksums.join('')}\`\`\``
// String manipulation to create a checksums table
body: String.concat('File | Checksum (SHA256)\n-- | --', checksums.map((e) => {
const line = e.replace('\n', '').split(' ');
return `<sub>${line[1]}</sub> | <sub>\`${line[0]}\`</sub>`;
}).join('\n'))
})
});
}
})
.catch((err) => {
console.log(err);
});
}
})
Expand Down
7 changes: 7 additions & 0 deletions interface/client/appStart.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ mistInit = function () {
console.info('Initialise Mist Interface');

EthBlocks.init();
const ethBlocksInterval = setInterval(() => {
if (_.isEmpty(EthBlocks.latest)) {
EthBlocks.init();
} else {
clearInterval(ethBlocksInterval);
}
}, 500);

Tabs.onceSynced.then(function () {
if (location.search.indexOf('reset-tabs') >= 0) {
Expand Down
Loading