Skip to content
This repository has been archived by the owner on Oct 17, 2022. It is now read-only.

Sync Master and GH #682

Merged
merged 17 commits into from
Sep 15, 2017
Merged
Prev Previous commit
Next Next commit
build
alexvansande committed Sep 13, 2017

Verified

This commit was signed with the committer’s verified signature.
tomusdrw Tomek Drwięga
commit a3f788826e6ab4862300d90b1c499044cead7185
2 changes: 1 addition & 1 deletion data/mist_releases.json

Large diffs are not rendered by default.

40 changes: 15 additions & 25 deletions dist/dao.html
Original file line number Diff line number Diff line change
@@ -87,10 +87,11 @@ <h4>The code</h4>
uint memberSince;
}

modifier onlyOwner {
require (msg.sender == owner);
_;
}
struct Vote {
bool inSupport;
address voter;
string justification;
}

// Modifier that allows only shareholders to vote and create new proposals
modifier onlyMembers {
@@ -142,11 +143,12 @@ <h4>The code</h4>
function removeMember(address targetMember) onlyOwner {
require(memberId[targetMember] != 0);

struct Vote {
bool inSupport;
address voter;
string justification;
}
for (uint i = memberId[targetMember]; i&lt;members.length-1; i++){
members[i] = members[i+1];
}
delete members[members.length-1];
members.length--;
}

/**
* Change voting rules
@@ -167,18 +169,8 @@ <h4>The code</h4>
debatingPeriodInMinutes = minutesForDebate;
majorityMargin = marginOfVotesForMajority;

/* First time setup */
function Congress (
uint minimumQuorumForProposals,
uint minutesForDebate,
int marginOfVotesForMajority
) payable {
changeVotingRules(minimumQuorumForProposals, minutesForDebate, marginOfVotesForMajority);
// It’s necessary to add an empty first member
addMember(0, &quot;&quot;);
// and let&#39;s add the founder, to save a step later
addMember(owner, &#39;founder&#39;);
}
ChangeOfRules(minimumQuorum, debatingPeriodInMinutes, majorityMargin);
}

/**
* Add Proposal
@@ -212,10 +204,8 @@ <h4>The code</h4>
ProposalAdded(proposalID, beneficiary, weiAmount, jobDescription);
numProposals = proposalID+1;

/// @notice Remove membership from `targetMember`
/// @param targetMember ethereum address to be removed
function removeMember(address targetMember) onlyOwner {
require(memberId[targetMember] != 0);
return proposalID;
}

/**
* Add proposal in Ether
10 changes: 0 additions & 10 deletions dist/js/frontier.min.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/js/frontier.min.js.map

This file was deleted.