|
|
1548e38db1
|
Merge pull request #6 from OpenZeppelin/master
Merge
|
2016-11-23 19:48:43 -08:00 |
|
|
|
58810f8b6d
|
Merge pull request #90 from adklempner/killable-test
Killable test
|
2016-11-23 19:44:21 -08:00 |
|
|
|
1c6f7e80b7
|
Merge pull request #5 from maraoz/killable-test
Killable test fix
|
2016-11-23 19:36:26 -08:00 |
|
|
|
c35261150c
|
fix Killable test
|
2016-11-23 19:33:49 -08:00 |
|
|
|
390e22dfae
|
Merge pull request #89 from maraoz/std-token
Remove redundant checks in StandardToken
|
2016-11-23 17:40:32 -08:00 |
|
|
|
e2051734c2
|
Merge pull request #87 from maraoz/readme
README and documentation improvements
|
2016-11-23 17:38:34 -08:00 |
|
|
|
8b1f1ab67b
|
Remove redundant checks in StandardToken
|
2016-11-23 17:37:44 -08:00 |
|
|
|
af388658e5
|
Create tests for Killable
|
2016-11-23 17:35:51 -08:00 |
|
|
|
582baea62b
|
killable formatting
|
2016-11-23 17:32:35 -08:00 |
|
|
|
35363c01b1
|
improve docs of base contracts
|
2016-11-23 17:27:29 -08:00 |
|
|
|
47d979aa72
|
Bounty docs
|
2016-11-23 17:21:28 -08:00 |
|
|
|
726840b8de
|
make Bounty inheritance explicit
|
2016-11-23 17:16:59 -08:00 |
|
|
|
5c9a18e1f6
|
fix markdown on README
|
2016-11-23 16:53:11 -08:00 |
|
|
|
b99fc005a3
|
token contract doc improvements
|
2016-11-23 16:51:40 -08:00 |
|
|
|
635c4c10ba
|
add horizontal line for Bounty
|
2016-11-23 14:54:04 -08:00 |
|
|
|
2298ec7439
|
fix markdown issue
|
2016-11-23 14:50:13 -08:00 |
|
|
|
72bfb848e3
|
polish README
|
2016-11-23 10:50:30 -08:00 |
|
|
|
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 |
|
