Commits · cbc18e6dccc70f284546c63d6d9607fcd506e648 · 俞永鹏 / openzeppelin-contracts-upgradeable · GitLab

14 Feb, 2017 1 commit
- Aragon new collaborating organization · cbc18e6d
  Demian Elias Brener authored Feb 14, 2017
  
  cbc18e6d Browse Files
13 Feb, 2017 3 commits
- Merge pull request #140 from AragonOne/vesting · f4624837
```
Vested Token implementation (Standard Token with vesting calendar)
```
  Manuel Aráoz authored Feb 13, 2017
  f4624837 Browse Files
- Change operations order for rounding. Make tests use blocktime as reference time rather than date. · 0a5af4b8
  Jorge Izquierdo authored Feb 13, 2017
  
  0a5af4b8 Browse Files
- Merge pull request #1 from maraoz/vesting · 74dfd351
```
Vesting test fixing help
```
  Jorge Izquierdo authored Feb 13, 2017
  74dfd351 Browse Files
10 Feb, 2017 8 commits
- remove console.logs from timer · ee56abcc
  Manuel Araoz authored Feb 10, 2017
  
  ee56abcc Browse Files
- make VestedToken test deterministic · b67f6092
  Manuel Araoz authored Feb 10, 2017
  
  b67f6092 Browse Files
- Rename GrantableToken to VestedToken · 0b71dcde
  Jorge Izquierdo authored Feb 10, 2017
  
  0b71dcde Browse Files
- Remove grantTokens without vesting function · f305382e
  Jorge Izquierdo authored Feb 10, 2017
  
  f305382e Browse Files
- Add safeDiv and min/max functions to SafeMath · 917b1295
  Jorge Izquierdo authored Feb 10, 2017
  
  917b1295 Browse Files
- lastTokenIsTransferableDate rename · abc646a9
  Jorge Izquierdo authored Feb 10, 2017
  
  abc646a9 Browse Files
- Make vested stock calculation more testable · 1697518d
  Jorge Izquierdo authored Feb 10, 2017
  
  1697518d Browse Files
- Transferrable is now transferrable · 93e7984c
  Jorge Izquierdo authored Feb 10, 2017
  
  93e7984c Browse Files
09 Feb, 2017 1 commit
- Add GrantableToken tests · 8d9e12ed
  Jorge Izquierdo authored Feb 09, 2017
  
  8d9e12ed Browse Files
08 Feb, 2017 5 commits
- GrantableTokenMock · fb0a9633
  Jorge Izquierdo authored Feb 08, 2017
  
  fb0a9633 Browse Files
- Merge branch 'master' of https://github.com/OpenZeppelin/zeppelin-solidity into vesting · ba7a0f76
  Jorge Izquierdo authored Feb 08, 2017
  
  ba7a0f76 Browse Files
- Merge pull request #139 from eordano/patch-1 · a72de719
```
BasicToken.sol: Remove useless check
```
  Manuel Aráoz authored Feb 08, 2017
  a72de719 Browse Files
- Grantable Token first version · ec6e728c
  Jorge Izquierdo authored Feb 08, 2017
  
  ec6e728c Browse Files
- BasicToken.sol: Remove useless check · 70fbc7fe
```
The condition this commit removes is already implemented by the call to `safeSub`
```
  Esteban Ordano authored Feb 07, 2017
  70fbc7fe Browse Files
06 Feb, 2017 1 commit
- Merge pull request #137 from JGcarv/chore/rename-to-pausable · ced4e2da
```
Renamed files and replaced occurencies of 'Stoppable' to 'Pausable'
```
  Manuel Aráoz authored Feb 06, 2017
  ced4e2da Browse Files
31 Jan, 2017 1 commit
- Renamed files and replaced occurencies of 'Stoppable' to 'Pausable' · ae73f1a5
  João Gabriel Carvalho authored Jan 30, 2017
  
  ae73f1a5 Browse Files
23 Jan, 2017 2 commits
- Merge pull request #136 from AragonOne/master · 26127ee3
```
Make test cases that use assertJump fail if they dont fail
```
  Manuel Aráoz authored Jan 23, 2017
  26127ee3 Browse Files
- Make test cases that use assertJump fail if they dont fail · 2f0471ff
  Jorge Izquierdo authored Jan 23, 2017
  
  2f0471ff Browse Files
17 Jan, 2017 3 commits
- Merge pull request #132 from OpenZeppelin/refactor · ad833fb4
```
Refactor folders in preparation for external audit
```
  Manuel Aráoz authored Jan 17, 2017
  ad833fb4 Browse Files
- Merge pull request #133 from jtakalai/patch-1 · a544f151
```
Fix typos
```
  Manuel Aráoz authored Jan 17, 2017
  a544f151 Browse Files
- Fix typos · 67ad6abd
```
On unrelated note, why on earth check like in safeAdd? Is it actually an overflow check?
```
  jtakalai authored Jan 17, 2017
  67ad6abd Browse Files
16 Jan, 2017 2 commits
- fix tests · 0dfb27ff
  Manuel Araoz authored Jan 16, 2017
  
  0dfb27ff Browse Files
- rearrange folders · ca8f2f23
  Manuel Araoz authored Jan 16, 2017
  
  ca8f2f23 Browse Files
09 Jan, 2017 2 commits
- Merge pull request #127 from OpenZeppelin/contributing · 2de7fec6
```
Add tag comment on CONTRIBUTING.md
```
  Manuel Aráoz authored Jan 09, 2017
  2de7fec6 Browse Files
- Add tag comment on CONTRIBUTING.md · 342e7bf9
```
Fixes #116
```
  Manuel Aráoz authored Jan 09, 2017
  342e7bf9 Browse Files
05 Jan, 2017 1 commit
- v1.0.1 · ac6f9288
  Manuel Araoz authored Jan 05, 2017
  
  ac6f9288 Browse Files
30 Dec, 2016 1 commit
- Merge pull request #78 from AugustoL/master · d54e56f9
```
DelayedClaimable contract extension of Claimable fix #64
```
  Manuel Aráoz authored Dec 30, 2016
  d54e56f9 Browse Files
29 Dec, 2016 2 commits
- Added claimAfterBlock variable and tests changes to support changes · d9749240
  AugustoL authored Dec 29, 2016
  
  d9749240 Browse Files
- Merge remote-tracking branch 'OpenZeppelin/master' · e310e672
  AugustoL authored Dec 29, 2016
  
  e310e672 Browse Files
27 Dec, 2016 1 commit
- Merge pull request #119 from adklempner/refactorDayLimit · 74adaeed
```
Decouple Shareable from DayLimit
```
  Manuel Aráoz authored Dec 27, 2016
  74adaeed Browse Files
26 Dec, 2016 2 commits
- Make resetSpentToday and setDailyLimit internal functions · a5602e7e
  Arseniy Klempner authored Dec 26, 2016
  
  a5602e7e Browse Files
- Merge pull request #102 from adklempner/test/MultisigWallet · 2a75a2c9
```
Create tests for MultisigWallet
```
  Manuel Aráoz authored Dec 26, 2016
  2a75a2c9 Browse Files
23 Dec, 2016 4 commits
- Merge pull request #123 from demibrener/readme · 6fa9e048
```
fix link
```
  Demian Brener authored Dec 23, 2016
  6fa9e048 Browse Files
- fix link · c21006e6
  Demian Elias Brener authored Dec 23, 2016
  
  c21006e6 Browse Files
- Merge pull request #122 from demibrener/readme · aa438fa0
```
add introductory guide to smart contracts
```
  Demian Brener authored Dec 23, 2016
  aa438fa0 Browse Files
- introductory guide to smart contracts · 1529e19b
  Demian Elias Brener authored Dec 23, 2016
  
  1529e19b Browse Files