-
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 branch 'trunk' into feature/notifications_refresh_p2
- Loading branch information
Showing
148 changed files
with
1,344 additions
and
355 deletions.
There are no files selected for viewing
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,39 @@ | ||
| # OS X generated file | ||
| .DS_Store | ||
|
|
||
| # Build-related files | ||
| fastlane/ | ||
|
|
||
| # Key-related files | ||
| .jks | ||
| .keystore | ||
|
|
||
| # Backup files | ||
| .bak | ||
|
|
||
| # Generated files | ||
| bin/ | ||
| gen/ | ||
| build/ | ||
| build.log | ||
|
|
||
| # Built application files | ||
| .apk | ||
| .ap_ | ||
| .aab | ||
|
|
||
| # Dex VM files | ||
| .dex | ||
|
|
||
| # Configuration files | ||
| .configure | ||
| .configure-files/ | ||
| google-services.json | ||
| google-upload-credentials.json | ||
| firebase.secrets.json | ||
| sentry.properties | ||
|
|
||
| # Gradle files | ||
| gradle.properties | ||
| local.properties | ||
| local-builds.gradle |
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,13 +1,17 @@ | ||
| name: ☢️ Danger | ||
| name: ☢️ Trigger Danger On Buildkite | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: [opened, reopened, ready_for_review, synchronize, edited, labeled, unlabeled, milestoned, demilestoned] | ||
| types: [labeled, unlabeled, milestoned, demilestoned] | ||
|
|
||
| jobs: | ||
| dangermattic: | ||
| # runs on draft PRs only for opened / synchronize events | ||
| if: ${{ (github.event.pull_request.draft == false) || (github.event.pull_request.draft == true && contains(fromJSON('["opened", "synchronize"]'), github.event.action)) }} | ||
| uses: Automattic/dangermattic/.github/workflows/reusable-run-danger.yml@v1.0.0 | ||
| if: ${{ (github.event.pull_request.draft == false) }} | ||
| uses: Automattic/dangermattic/.github/workflows/reusable-retry-buildkite-step-on-events.yml@v1.1.0 | ||
| with: | ||
| org-slug: "automattic" | ||
| pipeline-slug: "wordpress-android" | ||
| retry-step-key: "danger" | ||
| build-commit-sha: "${{ github.event.pull_request.head.sha }}" | ||
| secrets: | ||
| github-token: ${{ secrets.DANGERMATTIC_GITHUB_TOKEN }} | ||
| buildkite-api-token: ${{ secrets.TRIGGER_BK_BUILD_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
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
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,2 +1,4 @@ | ||
| On the Stats screen, percentages now appear in their correct position for right-to-left language users. Right on. | ||
|
|
||
| - We reorganized the Stats screen to show data about traffic and insights. | ||
| - We added a Subscribers tab to show data about site subscribers. | ||
| - We removed social subscribers from the Total Followers card. | ||
| - Site names and URLs are properly positioned for right-to-left language users. |
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 +1 @@ | ||
| April showers bring May flowers, but they unfortunately don’t bring release notes. Stay Juned for the next update. | ||
| Site names and URLs are now properly positioned for right-to-left language users. Right on. |
2 changes: 1 addition & 1 deletion
2
WordPress/src/androidTest/resources/new-stats-feature-response.json
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,3 +1,3 @@ | ||
| { | ||
| "stats_traffic_subscribers_tab": true | ||
| "stats_traffic_subscribers_tabs": true | ||
| } |
5 changes: 5 additions & 0 deletions
5
...tpack/java/org/wordpress/android/util/config/InAppUpdateBlockingVersionConfigConstants.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,5 @@ | ||
| package org.wordpress.android.util.config | ||
|
|
||
| const val IN_APP_UPDATE_BLOCKING_VERSION_REMOTE_FIELD = "jp_in_app_update_blocking_version_android" | ||
|
|
||
|
|
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
15 changes: 15 additions & 0 deletions
15
WordPress/src/main/java/org/wordpress/android/inappupdate/IInAppUpdateManager.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,15 @@ | ||
| package org.wordpress.android.inappupdate | ||
|
|
||
| import android.app.Activity | ||
|
|
||
| interface IInAppUpdateManager { | ||
| fun checkForAppUpdate(activity: Activity, listener: InAppUpdateListener) | ||
| fun completeAppUpdate() | ||
| fun cancelAppUpdate(updateType: Int) | ||
| fun onUserAcceptedAppUpdate(updateType: Int) | ||
|
|
||
| companion object { | ||
| const val APP_UPDATE_IMMEDIATE_REQUEST_CODE = 1001 | ||
| const val APP_UPDATE_FLEXIBLE_REQUEST_CODE = 1002 | ||
| } | ||
| } |
Oops, something went wrong.