Commit Graph

709 Commits

Author SHA1 Message Date
fea2a8383c Merge pull request #256 from DavidKnott/refactor-mintable-token
Refactor MintableToken Contract
2017-06-14 16:12:23 -03:00
ffe464a43e Refactors the Mintable Token contract 2017-06-14 10:38:32 -06:00
3fbcb1b282 Merge pull request #250 from jdkanani/yarn-setup
Add yarn support and use it for Travis CI
2017-06-12 12:11:14 -03:00
28b2a0c881 Move npm to yarn 2017-06-11 12:50:26 +05:30
7b9c1429d9 v1.0.7 v1.0.7 2017-06-09 19:31:09 -03:00
d53ddd4a95 Merge pull request #242 from DavidKnott/upgrade-truffle-and-solidity
Upgrade to Truffle version 3.2.2 and Solidity version 0.4.11
2017-06-07 15:04:57 -03:00
6ede3d9001 Upgrade to Truffle version 3.2.2 and Solidity version 0.4.11 2017-06-06 21:41:54 -06:00
c3cb0dcf80 Merge pull request #238 from DaveAppleton/master
remove redundant return
2017-06-06 11:02:46 -03:00
f214dccab9 removed redundant returns 2017-06-06 17:10:55 +08:00
c0cce27703 remove redundant return 2017-06-02 00:27:16 +08:00
2eded7a337 Merge pull request #237 from maraoz/coveralls
Add coveralls
2017-05-31 20:30:50 -03:00
41a6f1cd84 add coveralls 2017-05-31 17:15:50 -03:00
e1eed257f1 v1.0.6 v1.0.6 2017-05-29 18:29:48 -03:00
2bcb54b3cb Merge pull request #231 from maraoz/fix-vested-token
Implement VestedToken bug mitigation #3
2017-05-29 18:27:44 -03:00
7100e30bed Implement VestedToken bug mitigation #3 2017-05-29 17:52:19 -03:00
7f6921e787 Merge pull request #222 from aragon/refactor
[VestedToken] Add revokability and burnablity options and general refactor and optimizations
2017-05-29 17:17:54 -03:00
73ec224c93 Merge pull request #2 from maraoz/aragon-refactor
rebase to master
2017-05-29 22:05:05 +02:00
a62621eb59 merge @izqui PR with new docs changes 2017-05-29 16:19:03 -03:00
84843d42da Merge pull request #225 from DavidKnott/fix-natspec-typos
Edit natspec documentation typos
2017-05-25 18:44:01 -03:00
d08185fc3e Edit natspec documentation typos 2017-05-26 00:29:15 +03:00
efe09575e3 Merge pull request #210 from maurelian/master
Add natspec comments to contracts
2017-05-24 18:33:28 -03:00
c4796bb918 Fix comments again 2017-05-24 17:27:05 -04:00
111f13f0ce Add doc comments to multisig wallet 2017-05-24 16:51:05 -04:00
d357cf3a2e Minor changes to doc comments for token and other contracts 2017-05-24 16:51:01 -04:00
83f2849446 Minor edits to doc commenst in lifecycle, ownership, payment contracts. 2017-05-24 16:49:43 -04:00
d85be4a866 Add natspec to vestedToken.sol 2017-05-24 16:47:25 -04:00
f6f91298f0 Add natspec to all remaing contracts, except for vestedToken.sol 2017-05-24 16:47:21 -04:00
1547922b61 Added natspec to the remaining ownership contracts and payment contracts 2017-05-24 16:45:45 -04:00
602c18b394 Applied change regarding the styling 2017-05-24 16:45:41 -04:00
b5d4120adb Added natsec for all lifecycle contracts + bounty.sol, DayLimit.sol and LimitBalance.sol 2017-05-24 16:43:14 -04:00
e851938199 Add natspec comments to four ownership contracts 2017-05-24 16:35:09 -04:00
48a2e11dfe merge 2017-05-22 18:08:03 -04:00
22f60eace0 Use libraries syntax sugar for revoking grants logic 2017-05-22 18:06:57 -04:00
b788f33c6a Merge pull request #218 from cgewecke/coverage
Add coverage
2017-05-21 23:40:18 -03:00
592548715f Add solidity-coverage 2017-05-21 19:19:50 -07:00
0983f0065d Merge pull request #223 from aragon/safe-math-div
[SafeMath] Remove unnecessary checks from safeDiv
2017-05-21 23:06:42 -03:00
c4f78a5dd5 Remove unnecessary checks from safeDiv 2017-05-21 16:41:18 -04:00
e032b86231 Merge with Zeppelin master 2017-05-21 16:14:06 -04:00
a6a2ee2bf1 Merge with master 2017-05-21 16:08:47 -04:00
929367f0ab Reorg code 2017-05-21 12:10:04 +02:00
5a6340395f Fix grant id parameter in NewTokenGrant event 2017-05-21 11:22:30 +02:00
f812433706 Small refactor and documentation 2017-05-21 11:18:24 +02:00
713b472253 Add tests for non-revokable and revokable/burnable cases 2017-05-21 11:17:24 +02:00
a1d2b673c6 Fix tests for revokable/non burn vesting calendar 2017-05-21 10:44:03 +02:00
5b2f0aa93d Implement revokable and burnsOnRevoke options 2017-05-21 10:38:56 +02:00
ecbfcbb302 Merge pull request #221 from TokenMarketNet/feat/transfer-from-mitigation
Protect transferFrom() against short hand attack.
2017-05-18 12:43:51 -03:00
964185dec3 Protect transferFrom against short hand attack. 2017-05-18 00:38:41 +03:00
5c491987f3 Merge pull request #219 from TokenMarketNet/feat/approve-mitigation
approve() race condition mitigation
2017-05-17 13:26:19 -06:00
e1cf602487 Fix variable naming. 2017-05-17 01:41:43 +03:00
a3446507ec Add fix for the approve() mitigation. 2017-05-17 01:33:13 +03:00