forked from nextcloud/android
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into nmc/2035-navigationview_theming
- Loading branch information
Showing
177 changed files
with
4,548 additions
and
4,018 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
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,49 @@ | ||
| # SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors | ||
| # SPDX-FileCopyrightText: 2023 Álvaro Brey <[email protected]> | ||
| # SPDX-FileCopyrightText: 2023 Andy Scherzinger <[email protected]> | ||
| # SPDX-License-Identifier: GPL-3.0-or-later | ||
|
|
||
| name: Auto approve renovate PRs | ||
|
|
||
| on: | ||
| pull_request_target: | ||
| branches: | ||
| - main | ||
| - master | ||
| - stable* | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| concurrency: | ||
| group: renovate-approve-merge-${{ github.head_ref || github.run_id }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| auto-approve-merge: | ||
| if: github.actor == 'renovate[bot]' | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| # for hmarr/auto-approve-action to approve PRs | ||
| pull-requests: write | ||
| # for alexwilson/enable-github-automerge-action to approve PRs | ||
| contents: write | ||
|
|
||
| steps: | ||
| - uses: mdecoleman/pr-branch-name@bab4c71506bcd299fb350af63bb8e53f2940a599 # v2.0.0 | ||
| id: branchname | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| # GitHub actions bot approve | ||
| - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0 | ||
| if: startsWith(steps.branchname.outputs.branch, 'renovate/') | ||
| with: | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| # Enable GitHub auto merge | ||
| - name: Auto merge | ||
| uses: alexwilson/enable-github-automerge-action@main | ||
| if: startsWith(steps.branchname.outputs.branch, 'renovate/') | ||
| with: | ||
| github-token: ${{ secrets.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
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
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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,11 @@ | ||
| ## 3.29.1 (June 27, 2024) | ||
|
|
||
| - Bugfixes | ||
|
|
||
| Minimum: NC 16 Server, Android 7.0 Nougat | ||
|
|
||
| For a full list, please see https://github.com/nextcloud/android/milestone/93 | ||
|
|
||
| <!-- | ||
| ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors | ||
| ~ SPDX-FileCopyrightText: 2016-2024 Tobias Kaminsky <[email protected]> | ||
|
|
||
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,42 @@ | ||
| # SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors | ||
| # SPDX-License-Identifier: AGPL-3.0-or-later | ||
| version = 1 | ||
| SPDX-PackageName = "Nextcloud Android" | ||
| SPDX-PackageSupplier = "Nextcloud Android team <[email protected]>" | ||
| SPDX-PackageDownloadLocation = "https://github.com/nextcloud/android" | ||
|
|
||
| [[annotations]] | ||
| path = "gradle/wrapper/gradle-wrapper.jar" | ||
| precedence = "aggregate" | ||
| SPDX-FileCopyrightText = "2015-2021 the original authors" | ||
| SPDX-License-Identifier = "Apache-2.0" | ||
|
|
||
| [[annotations]] | ||
| path = ["user_manual/images/android-1.png", "user_manual/images/android-2.png", "user_manual/images/android-3.png", "user_manual/images/android-4.png", "user_manual/images/android-10.png", "user_manual/images/davdroid-1-button-in-nextcloud-app.png", "user_manual/images/davdroid-2-install-davdroid.png", "user_manual/images/davdroid-3-enter-password.png", "user_manual/images/davdroid-4-specify-owner-email.png"] | ||
| precedence = "aggregate" | ||
| SPDX-FileCopyrightText = "2016-2024 Nextcloud GmbH and Nextcloud contributors" | ||
| SPDX-License-Identifier = "AGPL-3.0-or-later" | ||
|
|
||
| [[annotations]] | ||
| path = ["user_manual/conf.py", "user_manual/android_app.rst", "user_manual/index.rst", "user_manual/conf.py", "user_manual/Makefile"] | ||
| precedence = "aggregate" | ||
| SPDX-FileCopyrightText = "2015-2016 ownCloud Inc., 2016-2024 Nextcloud GmbH" | ||
| SPDX-License-Identifier = "GPL-2.0-only" | ||
|
|
||
| [[annotations]] | ||
| path = ["user_manual/images/android-11.png", "user_manual/images/android-12.png", "user_manual/images/android-13.png", "user_manual/images/android-14.png", "user_manual/images/android-15.png", "user_manual/images/android-5.png", "user_manual/images/android-6.png", "user_manual/images/android-8.png", "user_manual/images/android-9.png"] | ||
| precedence = "aggregate" | ||
| SPDX-FileCopyrightText = "2015-2016 ownCloud Inc." | ||
| SPDX-License-Identifier = "GPL-2.0-only" | ||
|
|
||
| [[annotations]] | ||
| path = ["app/src/**/res/mipmap-**dpi/ic_launcher.png", "app/src/**/ic_launcher-web.png", "src/generic/fastlane/metadata/android/en-US/images/icon.png", "src/versionDev/fastlane/metadata/android/en-US/images/icon.png", "app/src/main/ic_launcher-web-round.png"] | ||
| precedence = "aggregate" | ||
| SPDX-FileCopyrightText = "2017-2024 Nextcloud GmbH <https://nextcloud.com/trademarks/>" | ||
| SPDX-License-Identifier = "LicenseRef-NextcloudTrademarks" | ||
|
|
||
| [[annotations]] | ||
| path = [".idea/**", "app/schemas/com.nextcloud.client.database.NextcloudDatabase/**.json", "app/screenshots/gplay/debug/**.png", "app/src/main/res/values-**/strings.xml", "src/**/fastlane/metadata/android/**/**.txt", "src/versionDev/fastlane/metadata/android/**/changelogs/**.txt", "app/src/androidTest/assets/**", "app/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker", "app/src/**/google-services.json", "app/src/main/res/drawable-**dpi/checker_16_16.png", "app/src/main/res/raw/encryption_key_words.txt", "app/src/main/resources/ical4j.properties", "app/src/main/res/drawable-**dpi/apk.png", "app/src/main/res/drawable-**dpi/fdroid.png", "app/src/main/res/drawable-**dpi/playstore.png", "app/src/main/res/drawable-**dpi/background.png", "app/src/main/res/drawable-**dpi/background_nc18.png"] | ||
| precedence = "aggregate" | ||
| SPDX-FileCopyrightText = "2016-2024 Nextcloud GmbH and Nextcloud contributors" | ||
| SPDX-License-Identifier = "AGPL-3.0-or-later" |
Oops, something went wrong.