Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix merge develop merge conflicts (#42)
* Pbsa develop (#28) * Sonar (#22) * ci: sonarlint WAL-223 * chore: rebuild * chore(release): 0.6.1 * PJL-24: security patches (#26) * Sonar (#22) * ci: sonarlint WAL-223 * chore: rebuild * chore(release): 0.6.1 * ci(packages): update packages to latest where possible two audit reports cannot be resolved as we cannot update a packages dependencies ourself. They are dev only issues so production is safe from these warnings PJL-24-security-patches * build: rebuild after npm package upgrades * chore: rebuild after pbsa-develop merge sync and conflict resolution * Patch npmignore file (#29) * chore(release): 0.6.2 * chore(release): 0.6.3 * chore(.npmignore): patch npmignore file ignore irrelevant files when publishing to NPM * Update readme with sonar scan badges (#30) * chore(release): 0.6.2 * chore(release): 0.6.3 * docs(readne): update readme to show status reports of repo status reports are automatically synced/updated with sonarcloud * sync with master (#31) (#32) * Pbsa develop (#28) * Sonar (#22) * ci: sonarlint WAL-223 * chore: rebuild * chore(release): 0.6.1 * PJL-24: security patches (#26) * Sonar (#22) * ci: sonarlint WAL-223 * chore: rebuild * chore(release): 0.6.1 * ci(packages): update packages to latest where possible two audit reports cannot be resolved as we cannot update a packages dependencies ourself. They are dev only issues so production is safe from these warnings PJL-24-security-patches * build: rebuild after npm package upgrades * chore: rebuild after pbsa-develop merge sync and conflict resolution * Patch npmignore file (#29) * chore(release): 0.6.2 * chore(release): 0.6.3 * chore(.npmignore): patch npmignore file ignore irrelevant files when publishing to NPM * Update readme with sonar scan badges (#30) * chore(release): 0.6.2 * chore(release): 0.6.3 * docs(readne): update readme to show status reports of repo status reports are automatically synced/updated with sonarcloud * 0.6.4 release (#36) * ci: sonarlint WAL-223 * chore: rebuild * chore(release): 0.6.1 * Sonar (#22) * ci: sonarlint * feat: add param to vesting_balance_create vesting_balance_type new requirement due to gpos additions on mainnet WAL-250 * build(packages): several packages updated some potential breaking changes, test impact on updates * docs: readme update indicating patch change reason PJL-23 * build: rebuild merged tag overlapping which adds sonarcloud files (no source code impact) and added new tag bump PJL-23 * chore: rebuild and merge security PR in * fix: use string instead of bool for balance type in vesting create * build: rebuild * improvement(vesting_balance_create): use enumerator for balance_type vesting_balance_create balance_type parameter using enumerator now for serializing the transaction to match the blockchain type for balance_type * improvement(vesting_balance_create): use enumerator for balance_type vesting_balance_create balance_type parameter using enumerator now for serializing the transaction to match the blockchain type for balance_type * improvement: vesting_balance_type enum * improvement: re-add policy items * improvement: re-add policy items * fix: add export data for vesting balance type * Revert "fix: add export data for vesting balance type" This reverts commit 24138cc. * fix: remove wrong export item * fix: add vesting_policy_initializer to exports * feat(account_update): added value.update_last_voting_time added value.update_last_voting_time to account_update serializer extensions object WAL-281 * feat: add balance_type to vesting balance withdraw * chore: sync with master some different versions existed, selected latest version from conflicts and reinstalled hence the update to shrinkwrap file. * chore: rebuild * chore(release): 0.6.4 * fix: remove vesting_balance_type from vesting_balance_withdraw_operation (#37) * Revert "fix: remove vesting_balance_type from vesting_balance_withdraw_operation (#37)" (#38) This reverts commit 6d3293b. Co-authored-by: Roshan Syed <[email protected]> Co-authored-by: mseaward <[email protected]> Co-authored-by: jotprabh1 <[email protected]> Co-authored-by: Bobinson K B <[email protected]>
- Loading branch information
5 people
committed
Jan 7, 2020
1 parent
b84b23a
commit 399ff48