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

Update from main #1029

Merged
merged 11 commits into from
Jun 23, 2023
Merged

Update from main #1029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ad9ba60
fix: parse operand value when field is number type (#1013)
Jshhhh May 19, 2023
303e915
chore(release): v2.14.0 (#1014)
Jshhhh May 22, 2023
adf26f4
fix: fix storage field prop import to storagemanager (#1016)
Jshhhh May 23, 2023
1fbf44d
chore(release): v2.14.1 (#1017)
Jshhhh May 23, 2023
8ff282f
fix: add getOverrideProps to StorageManager (#1020)
bombguy Jun 6, 2023
f7b1b60
chore(release): v2.14.2 (#1022)
bombguy Jun 6, 2023
43d8c72
fix: return theme declaration file from render func (#1023)
letsbelopez Jun 6, 2023
5d5060d
fix: alias colliding imported model name in hasMany relationship (#1019)
Jshhhh Jun 7, 2023
329e5c6
chore: update cli check
rtpascual Jun 14, 2023
6b5c4ff
chore: add specific cypress version to fix 12.15.0 bug (#1028)
rtpascual Jun 23, 2023
a446554
Merge branch 'main' into update-from-main
rtpascual Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/integ-setup.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ call lerna add --scope integration-test @aws-amplify/codegen-ui-react
call lerna add --scope integration-test @aws-amplify/codegen-ui-test-generator
call lerna add --no-ci --scope integration-test react-router-dom
call lerna add --no-ci --scope integration-test @types/react-router-dom
call lerna add --no-ci --dev --scope integration-test cypress
call lerna add --no-ci --dev --scope integration-test cypress@12.14.0
call lerna add --no-ci --dev --scope integration-test wait-on
call lerna add --no-ci --scope integration-test os-browserify
call lerna add --no-ci --scope integration-test path-browserify
Expand Down
2 changes: 1 addition & 1 deletion scripts/integ-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ lerna add --scope integration-test @aws-amplify/codegen-ui-react
lerna add --scope integration-test @aws-amplify/codegen-ui-test-generator
lerna add --no-ci --scope integration-test react-router-dom
lerna add --no-ci --scope integration-test @types/react-router-dom
lerna add --no-ci --dev --scope integration-test cypress
lerna add --no-ci --dev --scope integration-test cypress@12.14.0
lerna add --no-ci --dev --scope integration-test @cypress/code-coverage
lerna add --no-ci --dev --scope integration-test wait-on
lerna add --no-ci --dev --scope integration-test istanbul-lib-report
Expand Down