Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge/cs 40858 #1000

Merged
merged 64 commits into from
Aug 24, 2023
Merged

Merge/cs 40858 #1000

merged 64 commits into from
Aug 24, 2023

Conversation

abhinav-from-contentstack
Copy link
Contributor

  • updating development branch with latest changes from staging after hotfix release

cs-raj and others added 30 commits August 9, 2023 18:52
@cs-raj
Error while importing the global feilds refrences not removed
fb83941
@abhinav-from-contentstack
Merge pull request #983 from contentstack/development
10f745c 
Staging <- Development
@cs-raj
Restricting packages to minor version updates
bd88c47
@abhinav-from-contentstack
Merge pull request #985 from contentstack/fix/CS-40714
c005a13 
CS-40714- Restricting packages to minor version updates
@abhinav-from-contentstack
Merge pull request #984 from contentstack/staging
f33f5f4 
Main <- Staging : 16/08/2023
@cs-raj
Changes regarding the global field creation
a691c74
@cs-raj
test(bulk-publish): added tests for assets:publish, cross-publish, en…
233f876 
…tries:publish
@cs-raj
test: added test for entries non localized and modified cmds
cb489e4
@cs-raj
test: added test for stacks unpublish
8294609
@cs-raj
test: added tests for stacks publish
d84d54b
@antonyagustine @cs-raj
Fix: Importing data on dev environment giving error while importing M…
857ed9a 
…arketplace Apps.
@antonyagustine @cs-raj
fix: Cannot find module '.cs-launch.json'
81b3f90
@antonyagustine @cs-raj
fix: import unable to update marketplace app config in Destination Stack
c59ce95
@antonyagustine @cs-raj
Version bumped
4b14eea
@abhinav-from-contentstack @cs-raj
fix: bumped version for launch
02dba49
@abhinav-from-contentstack @cs-raj
fix: updated lock files, manifest and READMEs
ca7c0ed
@abhinav-from-contentstack @cs-raj
fix: added prepack sections for export and import commands
25b854f
@cs-raj
entries export
a21d355
@aman19K @cs-raj
fix: backup dir flag issue
8eebaa7
@aman19K @cs-raj
revert: backup dir changes
cffebdc
@aman19K @cs-raj
fix: backup-dir import command
a2ac03b
@aman19K @cs-raj
enable new file structure export & import
342983d
@aman19K @cs-raj
fix: create backup directory using config
f82e741
@aman19K @cs-raj
updated example config
b064791
@aman19K @cs-raj
refactor: import config
e095621
@cs-raj
entries import
ea06b06
@aman19K @cs-raj
refactor: remove temp file
d1c72e6
@aman19K @cs-raj
workflow export rewrite
a3857e0
@aman19K @cs-raj
workflow import rewrite
d1c478f
@aman19K @cs-raj
feat: stack export rewrite
3c84ff0
Shafeeq PP and others added 23 commits August 17, 2023 18:47
@cs-raj
fixed type issues
5347da8
@cs-raj
fix
72f9da4
@cs-raj
rewrite changes
3d121b9
@cs-raj
entries update
fbda94a
@cs-raj
version bumps
c77bed3
@cs-raj
version bump
2757fbc
@cs-raj
Restricting packages to minor version updates
edf7fb0
@abhinav-from-contentstack
Merge branch 'staging' into bugfix/CS-40469
dd6bfd8
@abhinav-from-contentstack
undo remove
5bbd0de
@abhinav-from-contentstack
fix: removed return true statements
a2116ad
@cs-raj
JSON rte childrens passed empty
bc2bb2e
fix for html rte asset reference
5ab3876
@abhinav-from-contentstack
Merge branch 'release/12171' into fix/cs-38735
009b524
@abhinav-from-contentstack
fix: added empty children condition to the multiple case
4286ea5
@abhinav-from-contentstack
Merge pull request #992 from contentstack/fix/cs-38735
0f1e452 
fix for html rte asset reference
@abhinav-from-contentstack
Merge pull request #994 from contentstack/fix/CS-40930
40350a4 
fix: added empty children condition to the multiple case
@abhinav-from-contentstack
fix: bumped cli version
cc3ecb0
@abhinav-from-contentstack
fix: updated lock files and READMEs
3800796
@abhinav-from-contentstack
Merge branch 'main' into release/12171
63413c7
@abhinav-from-contentstack
Merge pull request #993 from contentstack/release/12171
5ab00e4 
Release/12171
@abhinav-from-contentstack
Merge pull request #996 from contentstack/staging
d5a4127 
Main <- Staging
@abhinav-from-contentstack
Merge branch 'staging' into merge/CS-40858
2ed217c
@abhinav-from-contentstack
Merge branch 'main' into merge/CS-40858
0fe862c
@abhinav-from-contentstack abhinav-from-contentstack requested a review from a team as a code owner August 24, 2023 07:47
@abhinav-from-contentstack abhinav-from-contentstack merged commit 175f365 into development Aug 24, 2023
@abhinav-from-contentstack abhinav-from-contentstack deleted the merge/CS-40858 branch August 24, 2023 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antonyagustine antonyagustine antonyagustine approved these changes

@shafeeqd959 shafeeqd959 Awaiting requested review from shafeeqd959

@netrajpatel netrajpatel Awaiting requested review from netrajpatel

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

Successfully merging this pull request may close these issues.
4 participants
@abhinav-from-contentstack @antonyagustine @cs-raj @aman19K