Commits · 647fc1396302e8dfdd20529935e805a76ab689aa · 俞永鹏 / openzeppelin-contracts-upgradeable · GitLab

11 Oct, 2017 2 commits
- Merge pull request #492 from frangio/fix-vesting-revoke · 647fc139
```
TokenVesting bugfix
```
  Francisco Giordano authored Oct 11, 2017
  647fc139 Browse Files
- use safeTransfer · d5e0714f
  Francisco Giordano authored Oct 11, 2017
  
  d5e0714f Browse Files
09 Oct, 2017 3 commits
- explicitly mark functions public · a184013d
  Francisco Giordano authored Oct 09, 2017
  
  a184013d Browse Files
- make TokenVesting variables public · 7d08c4da
  Francisco Giordano authored Oct 09, 2017
  
  7d08c4da Browse Files
- fix a problem when revoke is called twice · 01b92d1d
  Francisco Giordano authored Oct 09, 2017
  
  01b92d1d Browse Files
05 Oct, 2017 1 commit
- Merge pull request #476 from martriay/add-token-vesting · 5aba967d
```
Add token vesting
```
  Francisco Giordano authored Oct 05, 2017
  5aba967d Browse Files
04 Oct, 2017 17 commits
- [TokenVesting] Remove VestedTokenMock · ffd10907
  Martín Triay authored Oct 04, 2017
  
  ffd10907 Browse Files
- [TokenVesting] Remove VestedToken and LimitedTranferToken · 22b92636
  Martín Triay authored Oct 04, 2017
  
  22b92636 Browse Files
- [TokenVesting] Fix test. · d21d35ca
  Martín Triay authored Oct 02, 2017
  
  d21d35ca Browse Files
- [TokenVesting] Remove unnecessary instatiation on test. · 4e39f50a
  Martín Triay authored Oct 02, 2017
  
  4e39f50a Browse Files
- [TokenVesting] Allow instantiation of already started vesting contracts. Improve comments' wording. · 9e0e80e8
  Martín Triay authored Oct 02, 2017
  
  9e0e80e8 Browse Files
- [TokenVesting] Rename events according to convention · 562fb694
  Martín Triay authored Oct 02, 2017
  
  562fb694 Browse Files
- [TokenVesting] Add a start parameter to constructor to defer vesting · 822de45b
  Martín Triay authored Sep 29, 2017
  
  822de45b Browse Files
- [TokenVesting] Fix vestedAmount calculation. Linearity test watches beneficiary… · bd561639
```
[TokenVesting] Fix vestedAmount calculation. Linearity test watches beneficiary balance over vestedAmount
```
  Martín Triay authored Sep 29, 2017
  bd561639 Browse Files
- [TokenVesting] Add linear release test · 696615d3
  Martín Triay authored Sep 28, 2017
  
  696615d3 Browse Files
- [TokenVesting] Fix should-revoke test · 645edfc9
  Martín Triay authored Sep 28, 2017
  
  645edfc9 Browse Files
- [TokenVesting] Add tests · a227b212
  Martín Triay authored Sep 28, 2017
  
  a227b212 Browse Files
- [TokenVesting] Add events · c11265e6
  Martín Triay authored Sep 27, 2017
  
  c11265e6 Browse Files
- add pending tests · 6344a76f
  Francisco Giordano authored Aug 29, 2017
  
  6344a76f Browse Files
- add revocable flag · 3da7c314
  Francisco Giordano authored Aug 29, 2017
  
  3da7c314 Browse Files
- add preconditions to constructor · 998c72ab
  Francisco Giordano authored Aug 28, 2017
  
  998c72ab Browse Files
- add shortcut for vestedAmount after vesting end · 00f323d1
  Francisco Giordano authored Aug 28, 2017
  
  00f323d1 Browse Files
- add TokenVesting contract · 80e591f4
  Francisco Giordano authored Aug 28, 2017
  
  80e591f4 Browse Files
25 Sep, 2017 1 commit
- Merge pull request #466 from phiferd/master · 5cf50367
```
Using require for Token preconditions
```
  Francisco Giordano authored Sep 25, 2017
  5cf50367 Browse Files
23 Sep, 2017 2 commits
- Adding some additional tests · 38373191
  Dan Phifer authored Sep 23, 2017
  
  38373191 Browse Files
- Moving business logic preconditions to the beginning of the function. · e70dd187
  Dan Phifer authored Sep 23, 2017
  
  e70dd187 Browse Files
22 Sep, 2017 1 commit
- Merge pull request #460 from dmx374/patch-3 · 158a7a88
```
Add explicit visibility
```
  Manuel Aráoz authored Sep 22, 2017
  158a7a88 Browse Files
21 Sep, 2017 1 commit
- v1.3.0 · 725ed40a
  Francisco Giordano authored Sep 21, 2017
  
  725ed40a Browse Files
19 Sep, 2017 1 commit
- Add explicit visibility · 3733c069
  Jack Bauer authored Sep 19, 2017
  
  3733c069 Browse Files
18 Sep, 2017 11 commits
- Merge pull request #446 from jakub-wojciechowski/master · 1df75a95
```
Make approve method compliant with ERC20
```
  Francisco Giordano authored Sep 18, 2017
  1df75a95 Browse Files
- Warning in approve method documentation. · adfd8fb6
  jakub-wojciechowski authored Sep 15, 2017
  
  adfd8fb6 Browse Files
- Make approve method compliant with ERC20 · 98f672b5
  jakub-wojciechowski authored Sep 14, 2017
  
  98f672b5 Browse Files
- Merge pull request #448 from SylTi/fix/small-fixes · e9068859
```
A bunch of small fixes
```
  Francisco Giordano authored Sep 18, 2017
  e9068859 Browse Files
- add whenNotPaused modifier to all of PausableToken functions that modify it's state. Fix #401 · 1203a247
  SylTi authored Sep 15, 2017
  
  1203a247 Browse Files
- replace var by uint256 in StandardToken. Fix #432 · 4a1ff913
  SylTi authored Sep 15, 2017
  
  4a1ff913 Browse Files
- change approve() to conform to ERC20. Fix #438 · 83918cad
  SylTi authored Sep 15, 2017
  
  83918cad Browse Files
- Merge pull request #260 from yondonfu/feature/merkleproof · d3c5ce26
```
Merkle proof library with tests and docs
```
  Francisco Giordano authored Sep 18, 2017
  d3c5ce26 Browse Files
- Merge pull request #445 from frangio/fix-leftover-testrpc · f60c5ad8
```
Properly kill background testrpc instance
```
  Francisco Giordano authored Sep 18, 2017
  f60c5ad8 Browse Files
- Merge branch 'master' into feature/merkleproof · bcda5bfe
  Yondon Fu authored Sep 18, 2017
  
  bcda5bfe Browse Files
- Merge pull request #457 from sot528/fix-typo · 33eb8b1d
```
Just fix typo.
```
  Francisco Giordano authored Sep 18, 2017
  33eb8b1d Browse Files