Commit Graph

3794 Commits

Author SHA1 Message Date
a3362f7216 Merge pull request #51 from AugustoL/master
Added Claimable contract as an extension of Ownable
2016-11-09 17:36:08 -03:00
df44240e83 Merge pull request #48 from federicobond/inheritance-bounty
Replace composition for inheritance in Bounty
2016-11-09 15:51:20 -03:00
278f060c56 Replace composition for inheritance in Bounty 2016-11-08 20:20:26 -03:00
056320ed94 Merge pull request #60 from OpenZeppelin/sol-0.4.4
migrate to 0.4.4
2016-11-08 13:06:40 -03:00
83f4104699 migrate to 0.4.4 2016-11-08 12:19:07 -03:00
0c0eb292ad Merge pull request #58 from federicobond/selfdestruct
Replace deprecated suicide with selfdestruct
2016-11-04 13:09:28 -03:00
defcf56664 Replace deprecated suicide with selfdestruct 2016-11-03 22:58:28 -03:00
75485ca346 Merge pull request #49 from federicobond/ownable-stoppable
Make Stoppable a subclass of Ownable
2016-11-03 20:50:40 -03:00
4599fbf248 Make Stoppable a subclass of Ownable. Fixes #47 2016-11-02 16:25:47 -03:00
0f3a8051d6 Added Claimable contract as an extension of Ownable with the Claimable tests 2016-11-02 14:20:52 -03:00
c70a0cfd5d Merge pull request #46 from adklempner/standard-token-tests
Add test for StandardToken
2016-11-01 14:39:19 -03:00
aa3cd8c03a Add test for StandardToken 2016-11-01 10:21:00 -07:00
5683417d61 v0.0.11 2016-10-31 16:29:29 -03:00
e2861e7591 fix spacing 2016-10-28 19:18:55 -03:00
6de19c59ae Merge pull request #43 from makoto/bounty_with_factory_merged
Bounty with factory (merged) version
2016-10-28 19:08:45 -03:00
949f25b244 Deploy mock contracts on test 2016-10-28 21:55:16 +01:00
e033d802ff Merge branch 'master' into bounty_with_factory_merged 2016-10-28 11:59:51 +01:00
3764b43689 Update doc on migration step 2016-10-28 11:46:41 +01:00
b6a5830047 Does not allow to create bounty contract without address 2016-10-28 11:22:41 +01:00
19d3b8b27d Merge pull request #42 from adklempner/standard-token-tests
Create tests for StandardToken
2016-10-28 02:41:16 -03:00
eb135e1d32 Merge pull request #39 from adklempner/emergency-stop
Add release method to Stoppable. Create StoppableMock
2016-10-28 02:38:41 -03:00
71edad126b Create tests for StandardToken 2016-10-27 22:17:21 -07:00
0432376391 Merge pull request #1 from OpenZeppelin/master
Merge from master
2016-10-27 17:51:33 -07:00
9509298622 Change spec descriptions 2016-10-27 23:02:56 +01:00
99f288bfb5 Consolidate TokenBounties into Bounty 2016-10-27 22:35:08 +01:00
caca41f855 Add README 2016-10-27 22:29:52 +01:00
a04481d2d8 Remove extra whitespace 2016-10-27 22:10:53 +01:00
37f4ff8d3e Add killable to bounty 2016-10-27 22:08:36 +01:00
e35ba313a7 Add specs to test success and fail case of claiming 2016-10-27 18:39:31 +01:00
e8262f7c4b Make default function payable 2016-10-26 22:38:20 +01:00
df0c2defc8 Restructure test 2016-10-26 19:48:12 +01:00
14b8496247 Pass factory address to bounty 2016-10-26 19:34:08 +01:00
721d8fbbf7 Pass factory address at contract creation phase 2016-10-26 09:12:17 +01:00
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