|
|
e310e6728b
|
Merge remote-tracking branch 'OpenZeppelin/master'
|
2016-12-29 15:54:19 -03:00 |
|
|
|
74adaeedf2
|
Merge pull request #119 from adklempner/refactorDayLimit
Decouple Shareable from DayLimit
|
2016-12-27 13:12:51 -03:00 |
|
|
|
a5602e7e7b
|
Make resetSpentToday and setDailyLimit internal functions
|
2016-12-26 13:59:21 -08:00 |
|
|
|
813c1ff0cd
|
Add payable to MultisigWalletMock()
|
2016-12-22 18:34:05 -08:00 |
|
|
|
8aa06bda38
|
Create tests for MultisigWallet
|
2016-12-22 18:34:05 -08:00 |
|
|
|
36fa2a72cf
|
Decouple Shareable from DayLimit
|
2016-12-21 16:43:39 -08:00 |
|
|
|
9c81dd29bb
|
Fix example contracts
|
2016-12-21 14:26:32 -05:00 |
|
|
|
bb22cd62ac
|
Merge pull request #100 from adklempner/shareable-test
Create tests for Shareable
|
2016-12-20 18:22:23 -03:00 |
|
|
|
e5eaa919b1
|
Make isOwner() const. Add necessary toString() calls in tests.
|
2016-12-20 13:02:24 -08:00 |
|
|
|
ba37d91878
|
Merge pull request #101 from adklempner/test/DayLimit
Create tests for DayLimit
|
2016-12-20 11:26:13 -03:00 |
|
|
|
80cc1808fc
|
Merge remote-tracking branch 'OpenZeppelin/master'
|
2016-12-19 19:11:31 -03:00 |
|
|
|
f79ad4e2f6
|
add 2 lines between top level definitions
|
2016-12-19 17:43:02 -03:00 |
|
|
|
02f7f4c49d
|
Fix invalid character on Claimable
|
2016-12-15 21:21:54 -03:00 |
|
|
|
77e732218e
|
Also change claimable to avoid conflicts with ERC20 tokens
|
2016-12-15 15:59:25 +01:00 |
|
|
|
41fdd5d4c6
|
fixes gh-109: resolve conflict between Ownable and ERC20 token.
|
2016-12-15 15:32:08 +01: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 |
|
|
|
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 |
|
|
|
b6feefaed9
|
Create tests for SafeMath
|
2016-11-23 19:51:23 -08:00 |
|
|
|
8b1f1ab67b
|
Remove redundant checks in StandardToken
|
2016-11-23 17:37:44 -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 |
|
|
|
b99fc005a3
|
token contract doc improvements
|
2016-11-23 16:51:40 -08:00 |
|
|
|
da2434e081
|
Add import for Ownable
|
2016-11-22 20:23:52 -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 |
|
|
|
93496fac01
|
Merge pull request #81 from maraoz/multisig
Multisig wallet first version
|
2016-11-22 03:33:42 -03:00 |
|
|
|
d31a31f1f0
|
first version of multisig
|
2016-11-21 23:14:32 -03:00 |
|
|
|
794596254b
|
Inherit Ownable in Migrations and Killable. Fix naming convention.
|
2016-11-20 19:48:30 -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 |
|
|
|
7bc35f6f78
|
polish BasicToken
|
2016-11-18 14:13:28 -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 |
|
|
|
0aa4d02044
|
DelayedClaimable contract with test added
|
2016-11-16 19:49:57 -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 |
|
|
|
3207996777
|
Merge pull request #65 from se3000/ownable_guard
add check prevening ownables from getting stuck
|
2016-11-14 22:06:30 -03:00 |
|
|
|
2b62f349ee
|
Fill totalSupply in StandardTokenMock
|
2016-11-14 18:22:05 -03:00 |
|
