Skip to content

Conversation

abhinav-from-contentstack
Copy link
Contributor

  • resolved merge conflicts while merging v3 <- v3-next

sunil-lakshman and others added 4 commits January 12, 2024 14:11
* feat: added taxonomies url

* fix: updated dependencies and settings to fix npm install and build warnings

* fix: added fix for ESM module cannot use module.exports issue

* WIP: added taxonomy files

* fix: updated talismanrc

* feat: added taxonomies url

* WIP: taxonomy tests

* feat: added , ,  and  for taxonomy query

* feat: version bump

* refactor: moved _extend

* fix: updated .talismanrc

* fix: added fixes for failing asset tests

* fix: corrected content-types for tests

* fix: removed .only from test, so that all tests may execute

* fix: fixed existing tests

* fix: fixed taxonomies url, levels param and added doc

* WIP: added integration test cases

* fix: added unit tests

* fix: added unit tests

* fix: corrected test prefix and content-type uid

* fix: bumped patch version and updated lock file

* fix: removed commented tests

* fix: removed unused file, updated description

* fix: corrected package version

* feat: added gcp_na region

* feat: updated talismanrc

* fix: updated minor version

* fix: replaced Taxonomies().Query() with Taxonomies()

* fix: updated tests and types

* Bug/cs 40045 x user agent (#108)

* Updated X-User-Agent header

* Updated the X-User-Agent

* fix: fixed vulnerabilities

---------

Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com>
Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com>
* feat: added taxonomies url

* fix: updated dependencies and settings to fix npm install and build warnings

* fix: added fix for ESM module cannot use module.exports issue

* WIP: added taxonomy files

* fix: updated talismanrc

* feat: added taxonomies url

* WIP: taxonomy tests

* feat: added , ,  and  for taxonomy query

* feat: version bump

* refactor: moved _extend

* fix: updated .talismanrc

* fix: added fixes for failing asset tests

* fix: corrected content-types for tests

* fix: removed .only from test, so that all tests may execute

* fix: fixed existing tests

* fix: fixed taxonomies url, levels param and added doc

* WIP: added integration test cases

* fix: added unit tests

* fix: added unit tests

* fix: corrected test prefix and content-type uid

* fix: bumped patch version and updated lock file

* fix: removed commented tests

* fix: removed unused file, updated description

* fix: corrected package version

* feat: added gcp_na region

* feat: updated talismanrc

* fix: updated minor version

* fix: replaced Taxonomies().Query() with Taxonomies()

* fix: updated tests and types

* Bug/cs 40045 x user agent (#108)

* Updated X-User-Agent header

* Updated the X-User-Agent

* fix: fixed vulnerabilities

* Fix/ghwf issuefix (#115)

* Updated X-User-Agent header (#109)

* feat: added taxonomies url

* fix: updated dependencies and settings to fix npm install and build warnings

* fix: added fix for ESM module cannot use module.exports issue

* WIP: added taxonomy files

* fix: updated talismanrc

* feat: added taxonomies url

* WIP: taxonomy tests

* feat: added , ,  and  for taxonomy query

* feat: version bump

* refactor: moved _extend

* fix: updated .talismanrc

* fix: added fixes for failing asset tests

* fix: corrected content-types for tests

* fix: removed .only from test, so that all tests may execute

* fix: fixed existing tests

* fix: fixed taxonomies url, levels param and added doc

* WIP: added integration test cases

* fix: added unit tests

* fix: added unit tests

* fix: corrected test prefix and content-type uid

* fix: bumped patch version and updated lock file

* fix: removed commented tests

* fix: removed unused file, updated description

* fix: corrected package version

* feat: added gcp_na region

* feat: updated talismanrc

* fix: updated minor version

* fix: replaced Taxonomies().Query() with Taxonomies()

* fix: updated tests and types

* Bug/cs 40045 x user agent (#108)

* Updated X-User-Agent header

* Updated the X-User-Agent

* fix: fixed vulnerabilities

---------

Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com>
Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com>

* Upgraded the working nodejs version in GH workflows

---------

Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com>
Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com>

---------

Co-authored-by: Abhinav Gupta <abhinav.gupta@contentstack.com>
Co-authored-by: abhinav <63039365+abhinav-from-contentstack@users.noreply.github.com>
@abhinav-from-contentstack abhinav-from-contentstack requested a review from a team as a code owner January 24, 2024 06:26
@abhinav-from-contentstack abhinav-from-contentstack requested review from harshithad0703, nadeem-cs, sunil-lakshman and ishaileshmishra and removed request for a team January 24, 2024 06:26
Copy link
Contributor

@harshithad0703 harshithad0703 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved.

Copy link
Contributor

@nadeem-cs nadeem-cs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@abhinav-from-contentstack abhinav-from-contentstack merged commit f2fe2f7 into v3-next Jan 24, 2024
@abhinav-from-contentstack abhinav-from-contentstack deleted the fix/v3-next-to-v3 branch January 24, 2024 06:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants