Commits · 4be30dc3aeea275bf75a03e7c73ed0fb4c0f5607 · 俞永鹏 / openzeppelin-contracts-upgradeable · GitLab

19 Jan, 2018 8 commits
- Merge branch 'master' into feature/implement_erc721_standard · 4be30dc3
  Facundo Spagnuolo authored Jan 19, 2018
  
  4be30dc3 Browse Files
- ERC20 totalSupply changed from public property to a function (#666) · 370e6a88
```
Fixes OpenZeppelin/zeppelin-solidity#434
```
  Santiago Palladino authored Jan 19, 2018
  370e6a88 Browse Files
- use short circuit (#654) · 9cc55ef2
  JU HYEONG PARK authored Jan 20, 2018
  
  9cc55ef2 Browse Files
- Merge branch 'master' into feature/implement_erc721_standard · 48594890
  Facundo Spagnuolo authored Jan 19, 2018
  
  48594890 Browse Files
- Merge pull request #693 from fulldecent/patch-1 · 6979e3c8
```
Fix test name
```
  Facundo Spagnuolo authored Jan 19, 2018
  6979e3c8 Browse Files
- Merge branch 'master' into patch-1 · 66402e9f
  Facundo Spagnuolo authored Jan 19, 2018
  
  66402e9f Browse Files
- Merge pull request #691 from frangio/fix-643 · 5b40202d
```
Add note about not following semver
```
  Francisco Giordano authored Jan 19, 2018
  5b40202d Browse Files
- Fix test name · da95df6b
  William Entriken authored Jan 18, 2018
  
  da95df6b Browse Files
18 Jan, 2018 32 commits
- add note about not following semver · 250572f4
  Francisco Giordano authored Jan 18, 2018
  
  250572f4 Browse Files
- Merge pull request #680 from ajsantander/azavalla-feature/inheritable-contract · ff9e9c4d
```
Azavalla feature/inheritable contract
```
  Alejandro Santander authored Jan 18, 2018
  ff9e9c4d Browse Files
- Merge branch 'master' into azavalla-feature/inheritable-contract · c8c0f21a
  Alejandro Santander authored Jan 18, 2018
  
  c8c0f21a Browse Files
- Merge pull request #684 from ajsantander/refactor/info-md-updates · 3a9a2c88
```
Updates to markdown documentation
```
  Alejandro Santander authored Jan 18, 2018
  3a9a2c88 Browse Files
- Merge branch 'master' into azavalla-feature/inheritable-contract · a5ea0af6
  Alejandro Santander authored Jan 18, 2018
  
  a5ea0af6 Browse Files
- Merge branch 'master' into refactor/info-md-updates · 42553ec0
  Alejandro Santander authored Jan 18, 2018
  
  42553ec0 Browse Files
- Index addreses in events and explicit uint size · c01203b0
  Alejandro Santander authored Jan 18, 2018
  
  c01203b0 Browse Files
- Explicit uint size · 9d005b49
  Alejandro Santander authored Jan 16, 2018
  
  9d005b49 Browse Files
- Fix solidity style issue · 22c1403e
  Alejandro Santander authored Jan 16, 2018
  
  22c1403e Browse Files
- Update test names and js style · 30095539
  Alejandro Santander authored Jan 16, 2018
  
  30095539 Browse Files
- [Heritable] added HeirOwnershipClaimed event · 5ea9bd44
  zava authored Nov 30, 2017
  
  5ea9bd44 Browse Files
- [Heritable] ownerLives(): constant --> view · 51c2c504
  zava authored Nov 30, 2017
  
  51c2c504 Browse Files
- renamed Inheritable --> Heritable · 52b6181d
  zava authored Nov 30, 2017
  
  52b6181d Browse Files
- [SimpleSavingsWallet.js] replace assertJump for expectThrow · fe712c67
  zava authored Nov 30, 2017
  
  fe712c67 Browse Files
- [Inheritable.js] replace assertJump for expectThrow · c70ee937
  zava authored Nov 30, 2017
  
  c70ee937 Browse Files
- added test for SimpleSavingsWallet · 46736da4
  zava authored Nov 29, 2017
  
  46736da4 Browse Files
- changed Inherited event for OwnershipTransfered · 82c85121
  zava authored Nov 29, 2017
  
  82c85121 Browse Files
- owner can't be set as heir · e5960465
  zava authored Nov 29, 2017
  
  e5960465 Browse Files
- setHeartbeatTimeout: public --> internal · 5716492e
  zava authored Nov 29, 2017
  
  5716492e Browse Files
- changed view for constant · c7807c5b
  zava authored Nov 29, 2017
  
  c7807c5b Browse Files
- changed events names on inheritable test · 43321353
  zava authored Nov 29, 2017
  
  43321353 Browse Files
- further example documentation · 560a855d
  zava authored Nov 28, 2017
  
  560a855d Browse Files
- marked ownerLives as view · 80ae074c
  zava authored Nov 28, 2017
  
  80ae074c Browse Files
- changed 'pronounce' for 'proclaim' · d808e49b
  zava authored Nov 28, 2017
  
  d808e49b Browse Files
- Use Inherited event instead of OwnershipTransfered · a8afb20c
  zava authored Nov 28, 2017
  
  a8afb20c Browse Files
- added example use-case for Inheritable.sol · a613cd03
  zava authored Nov 27, 2017
  
  a613cd03 Browse Files
- fixes · b709206f
  zava authored Nov 24, 2017
  
  b709206f Browse Files
- name fix · 2a560ad8
  zava authored Nov 23, 2017
  
  2a560ad8 Browse Files
- Inheritable contract · 4fe2157e
  zava authored Nov 23, 2017
  
  4fe2157e Browse Files
- Merge pull request #678 from ernestas2k/fix/rename-erc23-occurrences-to-erc223Mock#675 · 5a42a450
```
Rename ERC23 occurrences to ERC223
```
  Matt Condon authored Jan 18, 2018
  5a42a450 Browse Files
- Merge branch 'master' into fix/rename-erc23-occurrences-to-erc223Mock#675 · 49adfea6
  Matt Condon authored Jan 18, 2018
  
  49adfea6 Browse Files
- Merge pull request #689 from joejordan/patch-1 · a29fce9c
```
Update README.md
```
  Francisco Giordano authored Jan 18, 2018
  a29fce9c Browse Files