-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/release/24.1' into merge/24.0.2-…
…to-release_24.1
- Loading branch information
Showing
122 changed files
with
1,062 additions
and
553 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #!/bin/bash -eu | ||
|
|
||
| curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import | ||
| curl -Os https://uploader.codecov.io/latest/linux/codecov | ||
| curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM | ||
| curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig | ||
| gpgv codecov.SHA256SUM.sig codecov.SHA256SUM | ||
| sha256sum -c codecov.SHA256SUM | ||
| chmod +x codecov | ||
| ./codecov -t "$CODECOV_TOKEN" -f "$1" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| name: ☢️ Danger | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: [opened, synchronize, edited, review_requested, review_request_removed, labeled, unlabeled, milestoned, demilestoned] | ||
|
|
||
| jobs: | ||
| dangermattic: | ||
| uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@trunk | ||
| secrets: | ||
| github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| name: Submit dependencies to GitHub Dependency Graph | ||
| on: | ||
| push: | ||
| branches: | ||
| - trunk | ||
| - release/* | ||
| permissions: | ||
| contents: write | ||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'temurin' | ||
| java-version: '17' | ||
| - run: cp gradle.properties-example gradle.properties | ||
| - name: Setup Gradle to generate and submit dependency graphs | ||
| uses: gradle/gradle-build-action@v2 | ||
| with: | ||
| dependency-graph: generate-and-submit | ||
| - name: Generate the dependency graph which will be submitted post-job | ||
| run: ./gradlew :WordPress:dependencies --no-configure-on-demand |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+63.1 MB
WordPress/jetpackJalapeno/release/org.wordpress.android-jetpack-jalapeno-release.aab
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| - Get a WordPress plan with a free domain in the domain dashboard | ||
| - Device keyboard remains when editing text blocks | ||
| - Editor screen auto-scrolls to newly inserted blocks | ||
| - Unselect blocks by pressing device’s back button | ||
| - Share different media types to the app at once without crashing | ||
| - Get notified when you’re working offline. | ||
| - Image block uploads pause/resume with internet connection. | ||
| - See custom gradient selections in the editor. | ||
| - Fixed forward/back arrows for right-to-left readers. | ||
| - Daily Prompt tags work properly. | ||
| - Tap Site Domain cards to manage domains. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| Block Editor updates: | ||
| - Device keyboard remains when editing text blocks | ||
| - Screen auto-scrolls to newly inserted blocks | ||
| - Unselect blocks by pressing your device’s back button | ||
| - Share different media types to the app at once without crashing | ||
| - Get notified when you’re working offline. | ||
| - Image block uploads pause when you lose internet and resume when you reconnect. | ||
| - Select a custom gradient in the editor and see a color indicator. | ||
| - “Forward” and “back” arrows are correct for right-to-left readers. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemActivity.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package org.wordpress.android.designsystem | ||
|
|
||
| import android.content.res.Configuration | ||
| import android.os.Bundle | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import org.wordpress.android.ui.LocaleAwareActivity | ||
| import org.wordpress.android.util.extensions.setContent | ||
|
|
||
| class DesignSystemActivity : LocaleAwareActivity() { | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| setContent { | ||
| DesignSystem() | ||
| } | ||
| } | ||
|
|
||
| @Preview(name = "Light Mode") | ||
| @Preview( | ||
| uiMode = Configuration.UI_MODE_NIGHT_YES, | ||
| showBackground = true, | ||
| name = "Dark Mode" | ||
| ) | ||
|
|
||
| @Composable | ||
| fun PreviewDesignSystemActivity() { | ||
| DesignSystem() | ||
| } | ||
| } | ||
|
|
||
|
|
10 changes: 10 additions & 0 deletions
10
WordPress/src/main/java/org/wordpress/android/designsystem/DesignSystemDataSource.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package org.wordpress.android.designsystem | ||
|
|
||
| import org.wordpress.android.R | ||
|
|
||
| object DesignSystemDataSource { | ||
| val buttonOptions = listOf( | ||
| R.string.design_system_foundation, | ||
| R.string.design_system_components | ||
| ) | ||
| } |
Oops, something went wrong.