|
|
6ae7ac97f6
|
Merge pull request #181 from roderik/patch-1
Shareable is not used in this contract
|
2017-04-05 17:25:28 -03:00 |
|
|
|
41d2fde952
|
Fix vesting calculation logic
|
2017-04-05 13:13:17 +02:00 |
|
|
|
f0e7396619
|
Shareable is not used in this contract
|
2017-04-05 08:33:30 +02:00 |
|
|
|
0b88944b38
|
fix a few typos
|
2017-04-03 22:06:41 -03:00 |
|
|
|
61e33197b2
|
rename TransferableToken to LimitedTransferToken
fixes #179
|
2017-04-03 22:04:07 -03:00 |
|
|
|
6f311e72b3
|
change sha3 and suicide methods to keccak256 and selfdestruct
see ethereum/solidity#1476
|
2017-04-03 11:31:56 -03:00 |
|
|
|
a344d42a00
|
Merge pull request #170 from Recmo/feature/no-owner
Prevent contracts from owning Ether, Tokens and other contracts.
|
2017-03-31 16:51:18 -03:00 |
|
|
|
7f7238378c
|
change type of owners from uint[] to address[]
fixes #175
|
2017-03-31 13:14:59 -03:00 |
|
|
|
1d2b989e8e
|
Fix typo in comment
|
2017-03-31 09:39:29 +01:00 |
|
|
|
a2bd1bb7f6
|
Add ReentrancyGuard
|
2017-03-24 11:01:06 +00:00 |
|
|
|
ac3b3652c3
|
Add NoOwner
|
2017-03-23 15:48:22 +00:00 |
|
|
|
166a1070e5
|
Add HasNoContracts
|
2017-03-23 15:43:52 +00:00 |
|
|
|
94d3c447b7
|
Add HasNoTokens
|
2017-03-23 15:22:48 +00:00 |
|
|
|
d1af3ef1b3
|
Add HasNoEther
|
2017-03-23 12:23:27 +00:00 |
|
|
|
ffce7e3b08
|
Merge pull request #166 from AragonOne/transaferable
Add comments for Transferable Token
|
2017-03-20 15:43:56 -03:00 |
|
|
|
463ae97117
|
Merge pull request #160 from Recmo/feature/token-killable
Add TokenKillable
|
2017-03-20 11:27:19 -03:00 |
|
|
|
350ab09855
|
Add comments for TransferableToken
|
2017-03-20 10:16:48 +01:00 |
|
|
|
72029b6847
|
Decouple transferable logic from VestedToken
|
2017-03-14 20:22:18 +01:00 |
|
|
|
525a5522b0
|
Add TokenKillable
|
2017-03-14 14:09:59 +00:00 |
|
|
|
29ab824e5c
|
revert TokenGrant instantiation to old style
|
2017-03-09 14:37:02 -03:00 |
|
|
|
12aadbed51
|
Move check to transferFrom and add tests
|
2017-03-06 11:09:01 +01:00 |
|
|
|
23703280ee
|
Check if tokens are transaferable on approve
|
2017-03-06 11:02:57 +01:00 |
|
|
|
5e50090da0
|
Merge pull request #151 from AragonOne/clarity
Add clarifying comment to standard token transfer from function
|
2017-03-01 17:16:15 -03:00 |
|
|
|
b9257a1092
|
Add clarifying comment to standard token transfer from function
|
2017-02-27 16:32:42 +01:00 |
|
|
|
b134645637
|
Merge pull request #150 from maraoz/solidty-version
solidity version 0.4.8
|
2017-02-23 09:12:54 -03:00 |
|
|
|
26335e669e
|
Added a contactable contract and some tests for it
|
2017-02-22 16:28:01 -03:00 |
|
|
|
52b66c744f
|
solidity version 0.4.8
|
2017-02-21 19:29:03 -03:00 |
|
|
|
3d6988cf90
|
Update modifiers so that they fail "loudly" by throwing errors rather then silently no-oping. Updated tests to remain compatible with these changes
|
2017-02-21 00:05:59 +01:00 |
|
|
|
d24a2ed9a8
|
fix compiler error
|
2017-02-17 18:32:24 -03:00 |
|
|
|
b1cb7b5975
|
implement solium recommendations
|
2017-02-17 18:31:16 -03:00 |
|
|
|
9bd51db2b2
|
refactor tests for truffle 3
|
2017-02-17 18:03:52 -03:00 |
|
|
|
7e7193ae61
|
truffle 2=>3
|
2017-02-15 12:14:50 -03:00 |
|
|
|
60b48b0235
|
Solium
|
2017-02-13 13:26:56 -03:00 |
|
|
|
0a5af4b8ac
|
Change operations order for rounding. Make tests use blocktime as reference time rather than date.
|
2017-02-13 11:35:32 +01:00 |
|
|
|
b67f60929c
|
make VestedToken test deterministic
|
2017-02-10 18:32:58 -03:00 |
|
|
|
0b71dcded2
|
Rename GrantableToken to VestedToken
|
2017-02-10 16:20:23 +01:00 |
|
|
|
f305382ef4
|
Remove grantTokens without vesting function
|
2017-02-10 16:18:36 +01:00 |
|
|
|
917b129517
|
Add safeDiv and min/max functions to SafeMath
|
2017-02-10 16:17:02 +01:00 |
|
|
|
abc646a95c
|
lastTokenIsTransferableDate rename
|
2017-02-10 16:04:58 +01:00 |
|
|
|
1697518da8
|
Make vested stock calculation more testable
|
2017-02-10 15:28:20 +01:00 |
|
|
|
93e7984c61
|
Transferrable is now transferrable
|
2017-02-10 14:59:19 +01:00 |
|
|
|
8d9e12eda3
|
Add GrantableToken tests
|
2017-02-09 13:23:12 +01:00 |
|
|
|
fb0a96332c
|
GrantableTokenMock
|
2017-02-08 15:27:39 +01:00 |
|
|
|
ba7a0f7649
|
Merge branch 'master' of https://github.com/OpenZeppelin/zeppelin-solidity into vesting
|
2017-02-08 15:26:15 +01:00 |
|
|
|
ec6e728c0f
|
Grantable Token first version
|
2017-02-08 12:31:20 +01:00 |
|
|
|
70fbc7fe27
|
BasicToken.sol: Remove useless check
The condition this commit removes is already implemented by the call to `safeSub`
|
2017-02-07 19:45:32 -05:00 |
|
|
|
ae73f1a564
|
Renamed files and replaced occurencies of 'Stoppable' to 'Pausable'
|
2017-01-30 23:30:43 -02:00 |
|
|
|
ca8f2f2362
|
rearrange folders
|
2017-01-16 17:23:28 -03:00 |
|
|
|
d974924045
|
Added claimAfterBlock variable and tests changes to support changes
|
2016-12-29 16:12:32 -03:00 |
|
|
|
e310e6728b
|
Merge remote-tracking branch 'OpenZeppelin/master'
|
2016-12-29 15:54:19 -03:00 |
|
