Commit Graph

684 Commits

Author SHA1 Message Date
61e33197b2 rename TransferableToken to LimitedTransferToken
fixes #179
2017-04-03 22:04:07 -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
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
52b66c744f solidity version 0.4.8 2017-02-21 19:29:03 -03: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
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
f79ad4e2f6 add 2 lines between top level definitions 2016-12-19 17:43:02 -03:00
8b1f1ab67b Remove redundant checks in StandardToken 2016-11-23 17:37:44 -08:00
b99fc005a3 token contract doc improvements 2016-11-23 16:51:40 -08:00
7bc35f6f78 polish BasicToken 2016-11-18 14:13:28 -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
83f4104699 migrate to 0.4.4 2016-11-08 12:19:07 -03:00
e2861e7591 fix spacing 2016-10-28 19:18:55 -03:00
5eea131f1e extract simpler version of Token into separate file 2016-10-14 12:58:35 -03:00