3911 Commits

Author SHA1 Message Date
a02a8a6e41 Resolve conflicts 2016-10-26 09:05:58 +01:00
f2ec8790e8 WIP Target contract creation via factory pattern 2016-10-26 07:24:11 +01:00
48badda96f Fix typo 2016-10-26 07:24:11 +01:00
8e7c7d54b1 Deploy mock contracts only for test 2016-10-26 07:24:10 +01:00
83662fa548 Remove only 2016-10-26 07:24:10 +01:00
e318d6d246 Swap target contract at test by using abstract interface 2016-10-26 07:24:10 +01:00
8df9925d1a Swap SimpleToken with Target 2016-10-26 07:24:10 +01:00
b5469310a1 Add bounty test to test against checkInvarient 2016-10-26 07:20:41 +01:00
dfc133d9af Create tests for Stoppable. 2016-10-25 20:43:35 -07:00
f0ed649db3 Add release method to Stoppable. Create StoppableMock 2016-10-25 10:15:37 -07:00
441e85d823 Update README.md 2016-10-24 13:44:47 -03:00
5e6df079b2 Merge pull request #31 from gleim/master
Add bounties folder and CrowdsaleToken bounty contract
2016-10-24 11:11:02 -03:00
1b65e336cd Resolve PullPayment relative path for Bounties 2016-10-23 10:04:56 -07:00
87cc05613e Deploy SimpleTokenBounty and CrowdsaleTokenBounty 2016-10-23 10:04:28 -07:00
47b2c6d668 WIP Target contract creation via factory pattern 2016-10-22 23:29:13 +01:00
334073a64f Fix typo 2016-10-22 18:29:07 +01:00
bc3f2a66cc Deploy mock contracts only for test 2016-10-22 18:26:25 +01:00
f19a69beb4 Remove only 2016-10-22 18:18:02 +01:00
986509934b Swap target contract at test by using abstract interface 2016-10-22 18:16:42 +01:00
9345436957 Swap SimpleToken with Target 2016-10-22 18:01:17 +01:00
a98c5b8865 Add bounty test to test against checkInvarient 2016-10-22 17:27:46 +01:00
40af10df5e Correct relative directory reference 2016-10-21 16:22:55 -07:00
57d83fd022 Distinguish between Bounty types 2016-10-21 15:48:03 -07:00
bb3ebe13fa Separate bounty contracts from general pattern contracts 2016-10-21 15:44:30 -07:00
27b156dbc0 Create CrowdsaleTokenBounty 2016-10-21 15:43:02 -07:00
961a26ad40 Create SimpleTokenBounty 2016-10-21 15:42:43 -07:00
4bab15a4e6 Merge pull request #1 from OpenZeppelin/master
Upgrade to latest OpenZeppelin
2016-10-21 15:38:15 -07:00
5eea131f1e extract simpler version of Token into separate file 2016-10-14 12:58:35 -03:00
d1c57c285a v0.0.10 2016-10-14 12:39:45 -03:00
dbc2853372 fixes for StandardToken 2016-10-14 12:38:01 -03:00
a1f7de0ca1 fix problems with StandardToken 2016-10-14 10:55:16 -03:00
30d437c731 v0.0.9 2016-10-14 10:44:44 -03:00
c0c721b8a4 Merge pull request #27 from maraoz/token
Token improvements
2016-10-13 16:24:20 -03:00
0a0f8c58a2 StandardToken first version 2016-10-13 15:33:25 -03:00
f8c486ea1b style changes to base token 2016-10-12 20:07:15 -03:00
f53ec8613e new token base 2016-10-12 20:03:23 -03:00
d809558878 v0.0.8 2016-10-12 19:23:23 -03:00
e952a60bdd Merge pull request #25 from maraoz/ppc-test
Add tests to PullPayment
2016-10-12 22:04:09 +02:00
25a0210118 improve PullPaymentCapable 2016-10-12 16:51:12 -03:00
5ec4fbeb45 Merge pull request #26 from currymj/minor-fixes
Minor fixes
2016-10-12 21:42:33 +02:00
a9d030acb4 fix names, tests passing 2016-10-12 14:04:18 -04:00
5c07cd148d add pragmas and get tests to run 2016-10-12 14:02:54 -04:00
21fb7463c7 PullPayment rename fixes 2016-10-12 13:53:38 -04:00
25d0ed0006 changes for solidity 0.4 2016-10-12 13:52:24 -04:00
570d6cb940 Merge pull request #24 from maraoz/ppc-test
add PullPaymentCapable test
2016-10-05 22:12:06 +02:00
503faa051d rename PullPaymentCapable=>PullPayment 2016-10-05 17:08:40 -03:00
8b921dc6ec fix pullpaymentcapable test 2016-09-30 18:51:42 -03:00
8f4027cdf6 add PullPaymentCapable test 2016-09-30 18:13:10 -03:00
9c26899010 Add public to PullPaymentCapable data 2016-09-30 18:12:53 -03:00
5dbad00a8e Fix indenting in ownable 2016-09-30 18:12:28 -03:00