Commit Graph

480 Commits

Author SHA1 Message Date
8903e1b6c9 Merge pull request #80 from adklempner/documentation
Add documentation to README
2016-11-22 03:24:59 -03:00
6b65abf47b Add documentation to README 2016-11-21 18:31:50 -08:00
d31a31f1f0 first version of multisig 2016-11-21 23:14:32 -03:00
78f6b4cce0 Merge pull request #79 from adklempner/naming
Inherit Ownable in Migrations and Killable. Fix variable naming.
2016-11-21 23:14:14 -03:00
794596254b Inherit Ownable in Migrations and Killable. Fix naming convention. 2016-11-20 19:48:30 -08:00
3caaaaff81 Merge pull request #2 from OpenZeppelin/master
Merge
2016-11-20 19:25:51 -08:00
2aaf7ae21f DayLimit first version 2016-11-20 18:27:29 -03:00
93f693924a first shareable version 2016-11-20 18:07:37 -03:00
475cb5dc1f Renamed DelayedClaimable function and modifier 2016-11-19 12:13:09 -03:00
85a4013f49 Using modifier to check block on delayedClaimable, tests fixed 2016-11-18 20:32:22 -03:00
fb0f9c0570 Merge pull request #77 from maraoz/erc20basic
Polish BasicToken
2016-11-18 14:14:08 -03:00
7bc35f6f78 polish BasicToken 2016-11-18 14:13:28 -03:00
7d4e7b7982 Merge pull request #76 from maraoz/limit-funds
Limit funds improvements
2016-11-18 12:34:48 -03:00
4cd8aa7900 add more limit tests to LimitBalance 2016-11-18 12:33:52 -03:00
44138018dc limit funds improvements 2016-11-17 18:34:53 -03:00
da42a5c75f Merge pull request #74 from maraoz/rejector
remove references to rejector on README
2016-11-16 20:30:46 -03:00
b4c00cf6ec remove references to rejector on README 2016-11-16 20:30:20 -03:00
0aa4d02044 DelayedClaimable contract with test added 2016-11-16 19:49:57 -03:00
dfbcb23373 Merge pull request #73 from maraoz/tokens
Token contracts work
2016-11-16 13:23:15 -03:00
3e9bfbc77a add simple tests for BasicToken 2016-11-16 13:18:42 -03:00
8acc783309 rename lite->basic 2016-11-16 13:13:40 -03:00
10e8d6a09f move erc20 and standardtoken to token folder 2016-11-16 12:58:24 -03:00
a767b3df4a Merge pull request #71 from maraoz/fix-truffle-build
fix truffle build
2016-11-16 12:55:04 -03:00
69463d9120 fix truffle build 2016-11-16 12:51:41 -03:00
3207996777 Merge pull request #65 from se3000/ownable_guard
add check prevening ownables from getting stuck
2016-11-14 22:06:30 -03:00
eed0ba9519 Merge pull request #68 from OpenZeppelin/demibrener-patch-1
Collaborating organizations list
2016-11-14 22:05:50 -03:00
7c7ca1cf5f Update README.md 2016-11-14 19:28:51 -03:00
4cd3de4cbf Update README.md 2016-11-14 19:24:28 -03:00
e1dcab29de Merge pull request #69 from federicobond/tokenmock-totalsupply
Fill totalSupply in StandardTokenMock
2016-11-14 18:29:27 -03:00
2b62f349ee Fill totalSupply in StandardTokenMock 2016-11-14 18:22:05 -03:00
23448fa53c Update README.md 2016-11-14 17:56:15 -03:00
0e0d6c0a1c Collaborating organizations list 2016-11-14 17:54:21 -03:00
d7b38038ad Merge pull request #67 from se3000/fresh_fixtures
Move away from migration fixtures in tests
2016-11-14 14:21:38 -03:00
a156064b33 make claimable use fresh instances for each test 2016-11-13 17:00:19 -05:00
1547000d1c move Ownable tests away from migration fixtures 2016-11-13 16:58:25 -05:00
5f6b7f9301 add check prevening ownables from getting stuck 2016-11-13 16:03:11 -05:00
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