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

Chore: Merge main to next-release/main #7383

Merged
merged 16 commits into from
May 1, 2024
Merged

Chore: Merge main to next-release/main #7383

merged 16 commits into from
May 1, 2024

Conversation

jacoblogan
Copy link
Contributor

Description of changes:

Merging main branch into next-release/main

Related GitHub issue #, if available:

Instructions

If this PR should not be merged upon approval for any reason, please submit as a DRAFT

Which product(s) are affected by this PR (if applicable)?

  • amplify-cli
  • amplify-ui
  • amplify-studio
  • amplify-hosting
  • amplify-libraries

Which platform(s) are affected by this PR (if applicable)?

  • JS
  • Swift
  • Android
  • Flutter
  • React Native

Please add the product(s)/platform(s) affected to the PR title

Checks

  • Does this PR conform to the styleguide?

  • Does this PR include filetypes other than markdown or images? Please add or update unit tests accordingly.

  • Are any files being deleted with this PR? If so, have the needed redirects been created?

  • Are all links in MDX files using the MDX link syntax rather than HTML link syntax?

    ref: MDX: [link](https://docs.amplify.aws/)
    HTML: <a href="https://docs.amplify.aws/">link</a>

When this PR is ready to merge, please check the box below

  • Ready to merge

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

hbuchel and others added 9 commits April 30, 2024 11:55
@hbuchel
fix(main): update overflow background color in dark mode (#7316)
a1f26e8 
* fix(main): update background color in darkmode

* fix darkmode when system default is used
@tylerjroach @phantumcode @Jordan-Nelson
StoragePath Documentation for Gen1 (#7279)
d812dc7 
* storage: update swift storage with storage path

* chore: update swift storage docs with storage path

* chore: update storage getting started content

* chore: add callout warning to file access level

* chore: update gen2 callout

* chore: convert fragments to inline filter

* update storage path example

* Android Gen2 Storage

* remove upload from getting started

* Add Using Storagepath

* add content to storage path page

* Expand storagepath

* improve doc

* update callout message

* modify file access level callout

* add accidental remove

* gramatical issues

* Update src/pages/[platform]/build-a-backend/storage/download/index.mdx

Co-authored-by: Jordan Nelson <nejrd@amazon.com>

* Update src/pages/[platform]/build-a-backend/storage/upload/index.mdx

Co-authored-by: Jordan Nelson <nejrd@amazon.com>

* Update src/pages/[platform]/build-a-backend/storage/storagepath/index.mdx

Co-authored-by: Jordan Nelson <nejrd@amazon.com>

* Update src/pages/[platform]/build-a-backend/storage/list/index.mdx

Co-authored-by: Jordan Nelson <nejrd@amazon.com>

* Update src/pages/[platform]/build-a-backend/storage/remove/index.mdx

Co-authored-by: Jordan Nelson <nejrd@amazon.com>

* Bump Android version

---------

Co-authored-by: Tuan Pham <phantum@amazon.com>
Co-authored-by: Jordan Nelson <nejrd@amazon.com>
@sushpatg
Update npx amplify generate config -> outputs - Gen2 doc (#7344)
c38a9a7 
npx amplify generate config is throwing 
>>Unknown command: config

Generates post deployment artifacts

Commands:
  amplify generate outputs               Generates amplify outputs
  amplify generate forms                 Generates UI forms
  amplify generate graphql-client-code   Generates graphql API code
  amplify generate schema-from-database  Generates typescript data schema from a
                                          SQL database
@khatruong2009
chore: add kotlin update to docs and formatting changes for flutter (#…
15f5732 
…7023)

* chore: add kotlin update to docs and formatting changes for new flutter build.gradle creation

* chore: remove steps for apps created with flutter 3.16 and earlier
@ashika112 @jimblanc
JS Gen2 Storage Docs (#7323)
139eca8 
* [Gen2 Storage JS] DownloadData doc updates (#7049)
* [JS] Update migration docs to use path (#7143)
* [JS] Storage API - path update (#7145)
* [Gen2 Storage JS] Update version and path strings (#7307)
* fix missed $ in string

---------

Co-authored-by: Jim Blanchard <jim.l.blanchard@gmail.com>
@edwardfoyle @josefaidt
update sandbox secret management (#7108)
6e1dccb 
* update sandbox secret management

* Update src/pages/gen2/deploy-and-host/sandbox-environments/features/index.mdx

* Update src/pages/gen2/deploy-and-host/sandbox-environments/features/index.mdx

* Update src/pages/gen2/deploy-and-host/sandbox-environments/features/index.mdx

* Update src/pages/gen2/deploy-and-host/sandbox-environments/features/index.mdx

* Update src/pages/gen2/deploy-and-host/sandbox-environments/features/index.mdx

---------

Co-authored-by: josef <josef.aidt@gmail.com>
@hdworld11
add angular specific code snippet (#7353)
7e16dff 
* add angular specific code snippet

* update dist directory path
@iartemiev
chore(gen2): replace authMode 'iam' with 'identityPool' (#7370)
4f0e5c8
@jimblanc
fix: Typos in JS Auth migration & getting started guides (#7371)
4eb2ce8
timngyn
timngyn reviewed Apr 30, 2024
View reviewed changes
src/pages/[platform]/build-a-backend/storage/storagepath/index.mdx Outdated
Copy link
Member

Choose a reason for hiding this comment

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

I think this page needs to be moved to the gen1 directory since it came from this PR for gen1: #7279

jacoblogan and others added 2 commits April 30, 2024 14:03
@jacoblogan @timngyn
Update src/fragments/lib/storage/native_common/configureaccess/common…
4e223e4 
….mdx

Co-authored-by: Tim Nguyen <54393192+timngyn@users.noreply.github.com>
@jacoblogan @timngyn
Update src/fragments/lib/storage/native_common/configureaccess/common…
b3e65bb 
….mdx

Co-authored-by: Tim Nguyen <54393192+timngyn@users.noreply.github.com>
timngyn
timngyn requested changes Apr 30, 2024
View reviewed changes
Copy link
Member

@timngyn timngyn left a comment

Choose a reason for hiding this comment

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

I think where were some merges that git messed up on. Let me know if you need help with any of them or if you had any questions about my comments

hbuchel
hbuchel previously approved these changes Apr 30, 2024
View reviewed changes
timngyn
timngyn previously approved these changes May 1, 2024
View reviewed changes
@jacoblogan jacoblogan enabled auto-merge (squash) May 1, 2024 00:03
@jacoblogan jacoblogan merged commit 7ac494c into next-release/main May 1, 2024
5 checks passed
@jacoblogan jacoblogan deleted the main-to-next-main branch May 1, 2024 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hbuchel hbuchel hbuchel approved these changes

@katiegoines katiegoines katiegoines approved these changes

@timngyn timngyn timngyn left review comments

@josefaidt josefaidt Awaiting requested review from josefaidt josefaidt is a code owner

@hdworld11 hdworld11 Awaiting requested review from hdworld11 hdworld11 is a code owner

@renebrandel renebrandel Awaiting requested review from renebrandel

@dbanksdesign dbanksdesign Awaiting requested review from dbanksdesign

@ykethan ykethan Awaiting requested review from ykethan

@Jay2113 Jay2113 Awaiting requested review from Jay2113

@chrisbonifacio chrisbonifacio Awaiting requested review from chrisbonifacio

@aspittel aspittel Awaiting requested review from aspittel aspittel is a code owner

@swaminator swaminator Awaiting requested review from swaminator swaminator is a code owner

@ErikCH ErikCH Awaiting requested review from ErikCH

@arundna arundna Awaiting requested review from arundna

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

Successfully merging this pull request may close these issues.

None yet