Commit Graph

  • 07538c7d17 Merge 96c48c207e into 79b3a1b1a2 #129 Arseniy Klempner 2017-06-22 16:33:26 +0000
  • d8014ae649 Merge e4dfafa08a into 79b3a1b1a2 #271 Eric Stevens 2017-06-22 16:33:24 +0000
  • 79b3a1b1a2 Merge pull request #273 from jooray/patch-1 Manuel Aráoz 2017-06-22 13:15:28 -0300
  • c6a3c29eb4 Merge pull request #272 from rstormsf/Removal-of-install-script Manuel Aráoz 2017-06-22 10:34:07 -0300
  • dd34d8df0f Fix typo in StandardToken allowance documentation #273 Juraj Bednar 2017-06-22 15:33:34 +0200
  • 1e000243d9
    add test cases for migratable token #264 Jaynti Kanani 2017-06-22 14:38:59 +0530
  • 80d052d43f Fixes #253 #272 RStorm 2017-06-21 17:34:43 -0700
  • e4dfafa08a Add explicit throw to BasicToken.transfer #271 Kris Wallperington 2017-06-21 17:22:26 -0700
  • 968a5205d4
    change 0 to 0x0 for invalid address check Jaynti Kanani 2017-06-21 11:04:12 +0530
  • bc3687d227 Merge 1432878ac6 into 710f77dfe1 #268 Roman Storm 2017-06-20 15:23:59 +0000
  • 710f77dfe1 Merge pull request #269 from rstormsf/uint256 Manuel Aráoz 2017-06-20 12:23:52 -0300
  • b1e504d6c6 change uint to uint256 #269 RStorm 2017-06-19 18:55:09 -0700
  • 1432878ac6 fixes #262. Make Ownable's owner configurable in construction time #268 RStorm 2017-06-19 17:53:37 -0700
  • 3c6b970f1f Merge dbf361e31d into 7deaee04c8 #267 Eric Olszewski 2017-06-19 23:08:32 +0000
  • dbf361e31d Update SafeMath to be a contract instead of a library #267 Eric Olszewski 2017-06-19 18:07:55 -0500
  • 7deaee04c8 Merge pull request #263 from DaveAppleton/master Manuel Aráoz 2017-06-17 16:36:56 -0300
  • fdec99c57a
    add migratable token Jaynti Kanani 2017-06-17 14:01:36 +0530
  • 2020d56ba4 assert is now built in #263 Dave Appleton 2017-06-17 11:10:30 +0800
  • 2a2e74b5f0 Removed ECRecovery mock contract, ECRecovery funcions are public constants Augusto 2017-06-15 20:25:29 -0300
  • d666fc0ce2 added check to ret boolean on ECRecovery Augusto 2017-06-15 20:24:17 -0300
  • a49fe53fa1 Merge pull request #258 from mbrix/master Manuel Aráoz 2017-06-15 13:52:34 -0300
  • af4437f2a3 Fix ECRecovery contract indentation Augusto 2017-06-15 12:04:54 -0300
  • bc3db5d4c1 Fix weird indent issue for inline assembly Yondon Fu 2017-06-15 11:13:37 -0400
  • 30e202313d Fix indentation in MerkleProof.sol and remove mock contract Yondon Fu 2017-06-15 11:10:37 -0400
  • 2e0bd06da2 Add tests, docs and MerkleTree helper Yondon Fu 2017-06-15 11:07:22 -0400
  • cba1e71661 ECRecovery library added with test and docs Augusto 2017-06-14 15:57:35 -0300
  • 3c4d0d0a77 MerkleProof library and initial stubbed out tests Yondon Fu 2017-06-14 16:34:46 -0400
  • 403e7336a9 fixed typo #258 Matt 2017-06-14 16:31:12 -0400
  • fea2a8383c Merge pull request #256 from DavidKnott/refactor-mintable-token Manuel Aráoz 2017-06-14 16:12:23 -0300
  • ffe464a43e Refactors the Mintable Token contract #256 David Knott 2017-06-14 10:38:32 -0600
  • ff72dd2cd3 Create, test, and document CancellablePullPayment Contract #241 David Knott 2017-06-06 18:43:52 -0600
  • 3fbcb1b282 Merge pull request #250 from jdkanani/yarn-setup Manuel Aráoz 2017-06-12 12:11:14 -0300
  • 28b2a0c881
    Move npm to yarn #250 Jaynti Kanani 2017-06-11 12:07:17 +0530
  • aba0acf572 Merge 6d4dd0fe22 into 7b9c1429d9 #154 Manuel Aráoz 2017-06-10 01:00:06 +0000
  • 7b9c1429d9 v1.0.7 v1.0.7 Manuel Araoz 2017-06-09 19:31:09 -0300
  • a298d82499 Merge f5c924c39d into d53ddd4a95 #228 Jaynti Kanani 2017-06-09 18:04:44 +0000
  • f5c924c39d
    Merge branch 'crowdsale' of github.com:jdkanani/zeppelin-solidity into crowdsale #228 Jaynti Kanani 2017-06-09 23:33:56 +0530
  • a6e76ab708
    resolve conflict Jaynti Kanani 2017-06-09 23:30:46 +0530
  • d53ddd4a95 Merge pull request #242 from DavidKnott/upgrade-truffle-and-solidity Manuel Aráoz 2017-06-07 15:04:57 -0300
  • 7949148008 Merge e1abacefaa into c3cb0dcf80 #243 beth 2017-06-07 08:55:44 +0000
  • e1abacefaa Description of param _newLimit in setDailyLimit(uint _newLimit) at MultisigWallet.sol was missing producing a "No description given for param _newLimit" compilation error. #243 beth 2017-06-07 10:50:49 +0200
  • 6ede3d9001 Upgrade to Truffle version 3.2.2 and Solidity version 0.4.11 #242 David Knott 2017-06-06 21:26:24 -0600
  • fb3fa02be0 Merge f711150983 into c3cb0dcf80 #233 Prophet Daniel 2017-06-06 14:10:41 +0000
  • c3cb0dcf80 Merge pull request #238 from DaveAppleton/master Manuel Aráoz 2017-06-06 11:02:46 -0300
  • f214dccab9 removed redundant returns #238 Dave Appleton 2017-06-06 17:10:55 +0800
  • 89f1b20dde replace all instances of uint with uint256 #240 morrme 2017-06-02 16:52:25 -0500
  • c0cce27703 remove redundant return Dave Appleton 2017-06-02 00:27:16 +0800
  • 2eded7a337 Merge pull request #237 from maraoz/coveralls Manuel Aráoz 2017-05-31 20:30:50 -0300
  • 41a6f1cd84 add coveralls #237 Manuel Araoz 2017-05-31 17:15:50 -0300
  • 1429e57547 Create, test, and document RefundableToken Contract #236 David Knott 2017-05-31 13:15:17 -0600
  • f711150983 Removed onlyOwner modifyer from mint function #233 Prophet Daniel 2017-05-30 16:18:30 -0300
  • e1eed257f1 v1.0.6 v1.0.6 Manuel Araoz 2017-05-29 18:29:48 -0300
  • 2bcb54b3cb Merge pull request #231 from maraoz/fix-vested-token Manuel Aráoz 2017-05-29 18:27:44 -0300
  • 7100e30bed Implement VestedToken bug mitigation #3 #231 Manuel Araoz 2017-05-29 17:52:19 -0300
  • 7f6921e787 Merge pull request #222 from aragon/refactor Manuel Aráoz 2017-05-29 17:17:54 -0300
  • 73ec224c93 Merge pull request #2 from maraoz/aragon-refactor #222 Jorge Izquierdo 2017-05-29 22:05:05 +0200
  • 4d609c3a00 Merge a62621eb59 into 84843d42da #229 Manuel Aráoz 2017-05-29 19:24:32 +0000
  • a62621eb59 merge @izqui PR with new docs changes #229 Manuel Araoz 2017-05-29 16:19:03 -0300
  • 4e2e0ad68d
    add withdraw to send money from crowdsale contract to owner Jaynti Kanani 2017-05-28 21:55:51 +0530
  • 97e2489927 Create, test and document RefundableToken Contract #227 David Knott 2017-05-25 20:23:32 +0300
  • e07a7e4bb6 Edit natspec documentation typos David Knott 2017-05-26 00:29:15 +0300
  • 84843d42da Merge pull request #225 from DavidKnott/fix-natspec-typos Manuel Aráoz 2017-05-25 18:44:01 -0300
  • d08185fc3e Edit natspec documentation typos #225 David Knott 2017-05-26 00:29:15 +0300
  • efe09575e3 Merge pull request #210 from maurelian/master Manuel Aráoz 2017-05-24 18:33:28 -0300
  • c4796bb918 Fix comments again #210 maurelian 2017-05-24 17:27:05 -0400
  • 111f13f0ce Add doc comments to multisig wallet maurelian 2017-05-08 09:07:33 -0400
  • d357cf3a2e Minor changes to doc comments for token and other contracts maurelian 2017-05-08 09:07:03 -0400
  • 83f2849446 Minor edits to doc commenst in lifecycle, ownership, payment contracts. maurelian 2017-05-08 08:08:06 -0400
  • d85be4a866 Add natspec to vestedToken.sol João Gabriel Carvalho 2017-05-04 12:41:09 -0300
  • f6f91298f0 Add natspec to all remaing contracts, except for vestedToken.sol João Gabriel Carvalho 2017-05-03 18:16:28 -0300
  • 1547922b61 Added natspec to the remaining ownership contracts and payment contracts João Gabriel Carvalho 2017-05-01 13:48:20 -0300
  • 602c18b394 Applied change regarding the styling João Gabriel Carvalho 2017-04-29 12:56:46 -0300
  • b5d4120adb Added natsec for all lifecycle contracts + bounty.sol, DayLimit.sol and LimitBalance.sol João Gabriel Carvalho 2017-04-25 19:16:02 -0300
  • e851938199 Add natspec comments to four ownership contracts maurelian 2017-04-25 08:51:05 -0400
  • 90b1c917c1 Merge 28538d4eb0 into 342e7bf9ff #220 pipaman 2017-05-23 16:26:02 +0000
  • 24ddfe24da Update StandardToken.sol #224 pipaman 2017-05-23 13:24:51 -0300
  • 48a2e11dfe merge Jorge Izquierdo 2017-05-22 18:08:03 -0400
  • 22f60eace0 Use libraries syntax sugar for revoking grants logic Jorge Izquierdo 2017-05-22 18:06:57 -0400
  • 55b9da74b4 Merge 18971b2a61 into b788f33c6a #177 maurelian 2017-05-22 10:48:46 +0000
  • b1b21a9779 Merge 1b0f2adc37 into b788f33c6a #208 Riaan F Venter 2017-05-22 10:46:44 +0000
  • b788f33c6a Merge pull request #218 from cgewecke/coverage Manuel Aráoz 2017-05-21 23:40:18 -0300
  • 592548715f Add solidity-coverage #218 cgewecke 2017-05-21 19:19:50 -0700
  • 0983f0065d Merge pull request #223 from aragon/safe-math-div Manuel Aráoz 2017-05-21 23:06:42 -0300
  • c4f78a5dd5 Remove unnecessary checks from safeDiv #223 Jorge Izquierdo 2017-05-21 16:41:18 -0400
  • e032b86231 Merge with Zeppelin master Jorge Izquierdo 2017-05-21 16:14:06 -0400
  • a6a2ee2bf1 Merge with master Jorge Izquierdo 2017-05-21 16:08:47 -0400
  • 929367f0ab Reorg code Jorge Izquierdo 2017-05-21 12:10:04 +0200
  • 5a6340395f Fix grant id parameter in NewTokenGrant event Jorge Izquierdo 2017-05-21 11:22:30 +0200
  • f812433706 Small refactor and documentation Jorge Izquierdo 2017-05-21 11:18:24 +0200
  • 713b472253 Add tests for non-revokable and revokable/burnable cases Jorge Izquierdo 2017-05-21 11:17:24 +0200
  • a1d2b673c6 Fix tests for revokable/non burn vesting calendar Jorge Izquierdo 2017-05-21 10:44:03 +0200
  • 5b2f0aa93d Implement revokable and burnsOnRevoke options Jorge Izquierdo 2017-05-21 10:38:56 +0200
  • ecbfcbb302 Merge pull request #221 from TokenMarketNet/feat/transfer-from-mitigation Manuel Aráoz 2017-05-18 12:43:51 -0300
  • 28538d4eb0 Update BasicToken.sol #220 pipaman 2017-05-17 23:13:17 -0300
  • 8e5ec81fca Update BasicToken.sol pipaman 2017-05-17 19:28:36 -0300
  • 964185dec3 Protect transferFrom against short hand attack. #221 Mikko Ohtamaa 2017-05-18 00:38:41 +0300
  • ca58e3d4ee Update StandardToken.sol pipaman 2017-05-17 18:16:29 -0300
  • b206a4c470 Update StandardToken.sol pipaman 2017-05-17 16:28:47 -0300
  • 5c491987f3 Merge pull request #219 from TokenMarketNet/feat/approve-mitigation Manuel Aráoz 2017-05-17 13:26:19 -0600
  • 31f697f1f0 Update StandardToken.sol pipaman 2017-05-17 15:45:32 -0300