Commits · 9bca7de84cd6bcf86300c9b61b52b9f13dea3b50 · 俞永鹏 / openzeppelin-contracts-upgradeable · GitLab

11 Nov, 2021 2 commits
- Merge upstream master into patched/master · 9bca7de8
  github-actions authored Nov 11, 2021
  
  9bca7de8 Browse Files
- Fix Timelock Controller description typo (#2960) · e63b09c9
  Wittawat Patcharinsak authored Nov 11, 2021
  
  e63b09c9 Browse Files
09 Nov, 2021 2 commits
- Merge upstream master into patched/master · 49f21346
  github-actions authored Nov 09, 2021
  
  49f21346 Browse Files
- Fix link to #2849 in changelog · 57630d2a
  Francisco Giordano authored Nov 09, 2021
  
  57630d2a Browse Files
08 Nov, 2021 10 commits
- Merge upstream master into patched/master · 800faca8
  github-actions authored Nov 08, 2021
  
  800faca8 Browse Files
- Fix typo and reframed a sentence (#2951) · 2b4e0231
```
Corrected spelling for a word on line number 3 and sentence reframed on line number 309
```
  Bhaskar Kashyap authored Nov 09, 2021
  2b4e0231 Browse Files
- Merge upstream master into patched/master · 97c2ba2d
  github-actions authored Nov 08, 2021
  
  97c2ba2d Browse Files
- Grammar correction in utilities doc (#2952) · b5daea6d
```
Fix grammar in a sentence
```
  Bhaskar Kashyap authored Nov 09, 2021
  b5daea6d Browse Files
- Merge upstream master into patched/master · 32d70eaa
  github-actions authored Nov 08, 2021
  
  32d70eaa Browse Files
- Fix ERC1155 supply tracking (#2956) · 4088540a
```
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
```
  Hadrien Croubois authored Nov 08, 2021
  4088540a Browse Files
- Merge upstream master into patched/master · 6fbcd39d
  github-actions authored Nov 08, 2021
  
  6fbcd39d Browse Files
- fix typos in GovernorSettings (#2957) · ce51655c
  Hadrien Croubois authored Nov 08, 2021
  
  ce51655c Browse Files
- Merge upstream master into patched/master · e00ba238
  github-actions authored Nov 08, 2021
  
  e00ba238 Browse Files
- AccessControlEnumerable: Hook into the internal function (#2946) · 75798281
```
* AccessControlEnumerable: Hook into the internal function

* add changelog entry
```
  Hadrien Croubois authored Nov 08, 2021
  75798281 Browse Files
06 Nov, 2021 2 commits
- Merge upstream master into patched/master · cbe04a9d
  github-actions authored Nov 06, 2021
  
  cbe04a9d Browse Files
- Update governance.adoc (#2948) · 342265d2
  Nicolás Venturo authored Nov 06, 2021
  
  342265d2 Browse Files
04 Nov, 2021 2 commits
- Merge upstream master into patched/master · b3fae1f5
  github-actions authored Nov 04, 2021
  
  b3fae1f5 Browse Files
- Fix markdown rendering in utilities.adoc (#2934) · 5cdf2a8f
  Tadashi authored Nov 04, 2021
  
  5cdf2a8f Browse Files
03 Nov, 2021 2 commits
- Merge upstream master into patched/master · 9b981872
  github-actions authored Nov 03, 2021
  
  9b981872 Browse Files
- Improve documentation around ERC1155 · fbfe19d6
  Francisco Giordano authored Nov 03, 2021
  
  fbfe19d6 Browse Files
01 Nov, 2021 5 commits
- Merge upstream master into patched/master · 793e05ea
  github-actions authored Nov 01, 2021
  
  793e05ea Browse Files
- Improve formatting of docs for TimelockController roles · ee149877
  Francisco Giordano authored Nov 01, 2021
  
  ee149877 Browse Files
- Merge upstream master into patched/master · a6cd39f8
  github-actions authored Nov 01, 2021
  
  a6cd39f8 Browse Files
- Add missing newline in docs · 5a398018
  Francisco Giordano authored Nov 01, 2021
  
  5a398018 Browse Files
- Fix update-comment.js · a73ad8cc
  Francisco Giordano authored Oct 20, 2021
  
  a73ad8cc Browse Files
28 Oct, 2021 4 commits
- Merge upstream master into patched/master · 60e2fc36
  github-actions authored Oct 28, 2021
  
  60e2fc36 Browse Files
- Update index.adoc (#2922) · 46ce0cfa
```
Fixed typo
```
  Rui Lun Tran authored Oct 28, 2021
  46ce0cfa Browse Files
- Merge upstream master into patched/master · ce6dd6b1
  github-actions authored Oct 28, 2021
  
  ce6dd6b1 Browse Files
- Fix unbounded recursion in ERC20WithAutoMinerReward example · a51e181e
  Francisco Giordano authored Oct 28, 2021
  
  a51e181e Browse Files
27 Oct, 2021 4 commits
- Merge upstream master into patched/master · a6923d50
  github-actions authored Oct 27, 2021
  
  a6923d50 Browse Files
- Merge commit '29eeb282' of… · 89dcc77d
```
Merge commit '29eeb282' of github.com:OpenZeppelin/openzeppelin-contracts into patches
```
  Francisco Giordano authored Oct 27, 2021
  89dcc77d Browse Files
- Fix changelog links · 2b046d79
  Francisco Giordano authored Oct 27, 2021
  
  2b046d79 Browse Files
- Add mention of Solidity policy in our own security policy · a5625894
  Francisco Giordano authored Oct 27, 2021
  
  a5625894 Browse Files
20 Oct, 2021 1 commit
- Fix typo (#2919) · 9e138521
  soulofmischief authored Oct 20, 2021
  
  9e138521 Browse Files
19 Oct, 2021 3 commits
- Add a comment documenting the package version being used (#2918) · c9bdb1f0
  Francisco Giordano authored Oct 19, 2021
  
  c9bdb1f0 Browse Files
- Add changelog entries for #2849 · 7fe5326c
  Francisco Giordano authored Oct 19, 2021
  
  7fe5326c Browse Files
- Add Governor module for governance-settable parameters (#2904) · b12af48a
```
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
```
  Hadrien Croubois authored Oct 19, 2021
  b12af48a Browse Files
18 Oct, 2021 2 commits
- updated docs for governor votes, 0 is against not for (#2915) · 0db97c96
```
* updated docs for governor votes, 0 is against not for

* Revert unecessary changelog entry

Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
```
  Patrick Collins authored Oct 18, 2021
  0db97c96 Browse Files
- Add a VestingWallet (#2748) · 88e4b69b
```
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
```
  Hadrien Croubois authored Oct 18, 2021
  88e4b69b Browse Files
15 Oct, 2021 1 commit
- Fix code sample in utilities.adoc · e6f26b46
  Francisco Giordano authored Oct 14, 2021
  
  e6f26b46 Browse Files