Commit Graph

480 Commits

Author SHA1 Message Date
e859d53b6c Merge pull request #106 from FundRequest/master
fixes gh-99 PullPaymentMock needed a payable constructor
2016-12-13 16:35:49 +02:00
9d56414b75 fixed the code 2016-12-13 12:00:48 +01:00
fe184fdbdf Merge branch 'master' of https://github.com/FundRequest/zeppelin-solidity 2016-12-13 11:59:59 +01:00
c15fa95bea fixes gh-99 PullPaymentMock needed a payable constructor 2016-12-13 11:59:52 +01:00
0e58f7b992 fixes gh-99 PullPaymentMock needed a payable constructor 2016-12-13 11:53:31 +01:00
423cec41e3 claimBefore modifier removed on DelayedClaimable contract 2016-12-07 18:32:42 -03:00
c390e94da6 Create tests for DayLimit 2016-12-06 11:45:02 -08:00
0ec09f4131 Create tests for Shareable 2016-12-06 11:33:39 -08:00
ab93a8e3e8 Merge pull request #97 from sogoiii/async_await_tests
issue #57: Async await tests
2016-12-03 04:27:32 +02:00
c7eb6736ee DelayedClaimable contract with test added
Renamed DelayedClaimable function and modifier
2016-12-02 18:48:53 -03:00
42ccbb2276 Sync with v1.0.0 of zeppelin-solidity 2016-12-02 17:46:42 -03:00
38545eb648 fix: spelling in a test 2016-12-01 20:20:44 -08:00
eb41a81faa fix: made code cleaner. added helper. removed done from most tests. 2016-12-01 08:42:05 -08:00
688106e9c3 fix: made all the tests consistent. now with done. 2016-11-30 13:24:02 -08:00
f2142545c7 modified test to use async await pattern. 2016-11-27 12:09:48 -08:00
c920c40507 fix Build badge 2016-11-24 14:38:39 -08:00
55e2d17e71 v1.0.0 v1.0.0 2016-11-23 20:21:41 -08:00
7b67ff2a2b Merge pull request #94 from adklempner/safemath
Create tests for SafeMath
2016-11-23 20:20:08 -08:00
b6feefaed9 Create tests for SafeMath 2016-11-23 19:51:23 -08:00
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