Commits · 5f72ae716d96b96d230d1e0088e6fd9aa58ff77c · 俞永鹏 / openzeppelin-contracts-upgradeable

18 Dec, 2020 2 commits
- Merge upstream openzeppelin-contracts into upstream-patched · 5f72ae71
  github-actions authored Dec 18, 2020
  
  5f72ae71 Browse Files
- Use explicit conversions between addresses and numbers (#2439) · 6be0b410
```
Co-authored-by: hrkrshnn <webmail.hari@gmail.com>
Co-authored-by: cameel <cameel2@gmail.com>
```
  Alex Beregszaszi authored Dec 18, 2020
  6be0b410 Browse Files
15 Dec, 2020 1 commit
- Merge upstream openzeppelin-contracts into upstream-patched · c197b134
  github-actions authored Dec 15, 2020
  
  c197b134 Browse Files
14 Dec, 2020 2 commits
- Use bytes1 and avoid using the obsolete byte type (#2438) · 051d3401
  Alex Beregszaszi authored Dec 14, 2020
  
  051d3401 Browse Files
- Update lockfile (#2435) · 0a4233f0
```
Co-authored-by: Renovate Bot <bot@renovateapp.com>
```
  renovate[bot] authored Dec 14, 2020
  0a4233f0 Browse Files
12 Dec, 2020 1 commit
- Merge upstream openzeppelin-contracts into upstream-patched · e0d2b338
  github-actions authored Dec 12, 2020
  
  e0d2b338 Browse Files
11 Dec, 2020 2 commits
- Add ERC20 Permit (EIP-2612) (#2237) · ecc66719
```
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
Co-authored-by: Santiago Palladino <spalladino@gmail.com>
```
  Nicolás Venturo authored Dec 11, 2020
  ecc66719 Browse Files
- Merge upstream openzeppelin-contracts into upstream-patched · c32c5198
  github-actions authored Dec 11, 2020
  
  c32c5198 Browse Files
10 Dec, 2020 2 commits

Bump ini from 1.3.5 to 1.3.7 (#2430) · 03d51c56

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

authored Dec 10, 2020

03d51c56 Browse Files

Merge upstream openzeppelin-contracts into upstream-patched · 0c95b673
github-actions authored Dec 10, 2020

0c95b673 Browse Files

09 Dec, 2020 2 commits
- Edit ERC20 API index to make it clearer · 268c6ab3
  Francisco Giordano authored Dec 09, 2020
  
  268c6ab3 Browse Files
- Update lockfile (#2428) · 0786f31f
```
Co-authored-by: Renovate Bot <bot@renovateapp.com>
```
  renovate[bot] authored Dec 09, 2020
  0786f31f Browse Files
04 Dec, 2020 1 commit
- Remove EIP712 immutable cache · c52d549a
  Francisco Giordano authored Dec 04, 2020
  
  c52d549a Browse Files
03 Dec, 2020 1 commit
- Merge upstream openzeppelin-contracts into upstream-patched · 88fecfcc
  github-actions authored Dec 03, 2020
  
  88fecfcc Browse Files
02 Dec, 2020 3 commits
- Add ERC20 and ERC777 fixed supply presets #2377 (#2399) · 883116e4
```
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
```
  Ashwin Yardi authored Dec 02, 2020
  883116e4 Browse Files
- Add EIP 712 helpers (#2418) · 5748034c
  Francisco Giordano authored Dec 02, 2020
  
  5748034c Browse Files
- Merge upstream openzeppelin-contracts into upstream-patched · 460229bc
  github-actions authored Dec 02, 2020
  
  460229bc Browse Files
01 Dec, 2020 3 commits
- Fix Solidity warning · 061e7f0d
  Francisco Giordano authored Dec 01, 2020
  
  061e7f0d Browse Files
- Remove stalebot · a138dc39
  Francisco Giordano authored Dec 01, 2020
  
  a138dc39 Browse Files
- Merge upstream openzeppelin-contracts into upstream-patched · b12c2294
  github-actions authored Dec 01, 2020
  
  b12c2294 Browse Files
30 Nov, 2020 6 commits
- Update TimelockController docs (#2415) · fa2b2045
```
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
```
  Nicolás Venturo authored Nov 30, 2020
  fa2b2045 Browse Files
- Configure Codecov parameters · 73c7af10
  Francisco Giordano authored Nov 30, 2020
  
  73c7af10 Browse Files
- Change styling for headings in API pages · 18a8ae5a
  Francisco Giordano authored Nov 30, 2020
  
  18a8ae5a Browse Files
- Merge upstream openzeppelin-contracts into upstream-patched · 596c94a6
  github-actions authored Nov 30, 2020
  
  596c94a6 Browse Files
- Remove inheritance that conflicts with upgradeable transpiler · fa65bf89
  Francisco Giordano authored Nov 30, 2020
  
  fa65bf89 Browse Files
- Update lockfile (#2416) · 60c8b0e0
```
* Update lockfile

* fix ERC1155Pausable test

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
```
  renovate[bot] authored Nov 30, 2020
  60c8b0e0 Browse Files
27 Nov, 2020 1 commit
- Merge upstream openzeppelin-contracts into upstream-patched · 14f4bc40
  github-actions authored Nov 27, 2020
  
  14f4bc40 Browse Files
26 Nov, 2020 9 commits
- Merge branch 'release-v3.3' · acac4a7f
  Francisco Giordano authored Nov 26, 2020
  
  acac4a7f Browse Files
- 3.3.0 · 6be5ffe5
  Francisco Giordano authored Nov 26, 2020
  
  6be5ffe5 Browse Files
- Fix release script · ba843f0a
  Francisco Giordano authored Nov 26, 2020
  
  ba843f0a Browse Files
- Use custom ids for timelock docs section titles · 4297be6a
```
(cherry picked from commit 7d02933d)
```
  Francisco Giordano authored Nov 26, 2020
  4297be6a Browse Files
- Use custom ids for timelock docs section titles · 7d02933d
  Francisco Giordano authored Nov 26, 2020
  
  7d02933d Browse Files
- Fix NatSpec comment syntax · d2003a6f
```
(cherry picked from commit ef0483b4)
```
  Francisco Giordano authored Nov 26, 2020
  d2003a6f Browse Files
- Fix NatSpec comment syntax · ef0483b4
  Francisco Giordano authored Nov 26, 2020
  
  ef0483b4 Browse Files
- Add beacon proxy changelog entry · 9e51b2e5
  Francisco Giordano authored Nov 26, 2020
  
  9e51b2e5 Browse Files
- Add a beacon proxy contract (#2411) · 951e946e
```
Co-authored-by: Santiago Palladino <spalladino@gmail.com>
```
  Francisco Giordano authored Nov 26, 2020
  951e946e Browse Files
25 Nov, 2020 1 commit
- Merge upstream openzeppelin-contracts into upstream-patched · 750c60ba
  github-actions authored Nov 25, 2020
  
  750c60ba Browse Files
24 Nov, 2020 3 commits
- 3.3.0-rc.2 · 1fccf6fa
  Francisco Giordano authored Nov 24, 2020
  
  1fccf6fa Browse Files
- Remove Address.functionDelegateCall · 7f8fc584
  Francisco Giordano authored Nov 24, 2020
  
  7f8fc584 Browse Files
- Add mention of TimelockController in intro to access docs · 1d1d2ba6
```
(cherry picked from commit 520bf7ac)
```
  Francisco Giordano authored Nov 24, 2020
  1d1d2ba6 Browse Files