|
|
54b2d9ceb2
|
move Bounty docs with others
|
2016-11-23 10:39:19 -08:00 |
|
|
|
94255f15e4
|
Merge pull request #86 from OpenZeppelin/maraoz-patch-1
Add badges to README
|
2016-11-22 21:24:09 -08:00 |
|
|
|
42e5e45959
|
Update README.md
|
2016-11-22 21:23:51 -08:00 |
|
|
|
a61ee27349
|
Merge pull request #85 from maraoz/travis
Add Travis CI
|
2016-11-22 21:15:49 -08:00 |
|
|
|
2c7d883164
|
Add .travis.yml
|
2016-11-22 21:11:10 -08:00 |
|
|
|
3606f49162
|
Merge pull request #84 from adklempner/master
Change LimitFunds to LimitBalance in migrations file
|
2016-11-22 20:47:50 -08:00 |
|
|
|
032cae05c0
|
Change to right contract name for LimitBalance
|
2016-11-22 20:34:54 -08:00 |
|
|
|
9e443b5471
|
Merge pull request #83 from adklempner/master
Add import for Ownable to Migrations
|
2016-11-22 20:27:42 -08:00 |
|
|
|
da2434e081
|
Add import for Ownable
|
2016-11-22 20:23:52 -08:00 |
|
|
|
c7f14083c1
|
Merge pull request #4 from OpenZeppelin/master
Merge multisig fixes
|
2016-11-22 20:22:14 -08:00 |
|
|
|
d6d9e31b50
|
Merge pull request #82 from maraoz/multisig
fix multisig problems
|
2016-11-22 20:15:03 -08:00 |
|
|
|
701f7b1e83
|
fix multisig problems
|
2016-11-22 20:12:51 -08:00 |
|
|
|
fe9686b636
|
Merge pull request #3 from OpenZeppelin/master
Merge with master
|
2016-11-22 18:40:32 -08:00 |
|
|
|
93496fac01
|
Merge pull request #81 from maraoz/multisig
Multisig wallet first version
|
2016-11-22 03:33:42 -03:00 |
|
|
|
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 |
|
