Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Promoting release/21.0.x features to latest version #773

Merged
merged 309 commits into from
Jul 14, 2020
Merged

Promoting release/21.0.x features to latest version #773

merged 309 commits into from
Jul 14, 2020

Conversation

bradlhart
Copy link
Contributor

Change Description

API Changes

  • API Changes

Documentation Additions

  • Documentation Additions

Mike Manfredi and others added 30 commits October 4, 2019 16:06
adding arg to default to the proper config
3274241
fixing test
c3a09d9
@GreenBusDriver
Merge pull request #591 from EOSIO/01_fixIssue390
913ca73 
Fix Issue #390
Setup functions for Priv/Pub keys to be converted into and out of Ell…
252e749 
…iptic format; setup tests to verify functions are actually reciprocals of each other.
Rework how priv/pub keys are instantiated and add sig/verify functions
eab325f
get all tests working again
36f599d
adding comments and cleaning up code for PR
24a22a9
adding optional arg to pass in an ecurve
2b0ca58 
fixed the typing on the key store in SigProvider
integrating PR feedback
relocating default init of ec
further optimizing ec object passing around; removing function from its original location, I already moved
@GreenBusDriver
Merge pull request #597 from EOSIO/refactorFormatConverters
27905cc 
Add conversion helpers for to/from elliptic lib
added license, version, and build passing badges
596749a
adding npm pcakge img
d2d664a
fixing url
35e3663
positioning npm badge
e0edddc
removing npm badge
849698b
PR feedback about badge arrangement
0325877
correcting syntax
c270c6f
@GreenBusDriver
Merge pull request #601 from EOSIO/fixIssue372Badges
7553d13 
Fix #372: Added license, version, and build passing badges
removing babel-cli removes need for babel-polyfill
a46f2cc
@GreenBusDriver
Merge pull request #600 from EOSIO/fixIssue450-onlyOneBabelPolyfill
94408c5 
Fix Issue #450: Removing babel-cli removes need for babel-polyfill
@dskvr
fix carriage return
584b10f
@dskvr
rename basic-usage.md page to index.md because it's a child of basic-…
c2cc6d0 
…usage
@dskvr
Merge pull request #588 from EOSIO/docs/starter
af47366 
eosjs content plan 👍
fixing signing
e7a0106
fixing a test
3ba42f2
@GreenBusDriver
Merge pull request #605 from EOSIO/fixingSignMethod
cd2fb09 
Fixing sign() method
@UMU618
* fix hash() misuse
5432e91
@sjkelleyjr
bugfix. Changing wasmFilePath to wasmHexString in full code example
40d5ed5
adding arg to default to the proper config
d9079b3
added license, version, and build passing badges
5efa057
adding npm packge img
74c12f3
Bradley Hart and others added 28 commits June 10, 2020 15:24
Merge branch 'release/21.0.x' into dependency-check
cc6db37
Upgrading to latest versions
1de6c0d
Merge pull request #753 from EOSIO/dependency-check
c304ea3 
Bumping versions or removing unused dependencies
Fixes differences between develop and release/21.0.x
d666d32
Merge pull request #754 from EOSIO/fix-merge-issues
b9e4273 
Resolves differences missed in merging
Adding step to get protected status, streamlining git push action
b59aebd
Checking with new fixes
b141083
Working conditional for token, switched to b1 devops for the user
8f688be
PR needs to checkout the code
b5daa61
Replacing travis badge
25f8979
Removing fork from URL
1d538dd
@blockone-devops
Updating package.json and yarn.lock
d611790
Merge pull request #756 from EOSIO/protected-cicd-release21
59367b8 
Updating CI/CD to check for protected branch and use token so workflow re-runs (release/21.0.x branch)
Bumping version to -rc3
0f71f12
@blockone-devops
Updating package.json and yarn.lock
409b29d
Merge pull request #766 from EOSIO/version-bump
301c091 
Bumping version to `-rc3`
Bump elliptic version for security vulnerability
9ebd2f7
@blockone-devops
Updating package.json and yarn.lock
8741060
@jlamarr22
Merge pull request #768 from jlamarr22/v21-elliptic-bump
16044f4 
Bump elliptic - v21
Bump version to 21.0.2-rc3
0635dad
@jlamarr22
Merge pull request #769 from jlamarr22/bump-21.0.2-rc3
dc83e51 
Bump RC version
Updating version
db10725
Resolving security vulnerabilities
a7ff1cc
Merge pull request #772 from EOSIO/stable-version-bump
cd90386 
Updating version to 21.0.2
Merging changes from master branch to release/21.0.x
b61992d
Merge pull request #774 from EOSIO/merge-master-to-release
cfd0982 
Merging changes from master branch to release/21.0.x
@jeffreyssmith2nd
Merge branch 'master' into release/21.0.x
8c396b3
@jeffreyssmith2nd
Fix package.json
c7989e4
@bradlhart bradlhart merged commit 203e13e into master Jul 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jeffreyssmith2nd jeffreyssmith2nd jeffreyssmith2nd approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.