Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f9f119e2 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Merge branch 'beta' into release 

# Conflicts:
#	app-k9mail/build.gradle.kts
#	app-k9mail/src/main/res/raw/changelog_master.xml
#	app-thunderbird/build.gradle.kts
#	app-thunderbird/src/main/res/raw/changelog_master.xml
parents 760aaf8b 663b6e6b

.github/ISSUE_TEMPLATE/bug_report.yml

+4 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ body: 
    id: expected

    attributes:

      label: Expected behavior

      description: After following the steps, what did you think K-9 Mail would do?

      description: After following the steps, what did you think the app would do?

    validations:

      required: true

  - type: textarea
@@ -77,7 +77,7 @@ body: 
    attributes:

      label: Actual behavior

      description: |

        What did K-9 Mail do instead? Screenshots might help. Usually, you can take a screenshot by pressing 

        What did the app do instead? Screenshots might help. Usually, you can take a screenshot by pressing

        *Power* + *Volume down* for a few seconds.

    validations:

      required: true

.github/ISSUE_TEMPLATE/config.yml

+4 −1
Original line number Diff line number Diff line 
blank_issues_enabled: false

contact_links:

  - name: Feature Request

    url: https://connect.mozilla.org/t5/ideas/idb-p/ideas/label-name/thunderbird%20android

    about: Submit your ideas to improve Thunderbird for Android.

  - name: Mozilla Support Forum (SUMO)

    url: https://support.mozilla.org/en-US/products/thunderbird-android

    url: https://support.mozilla.org/products/thunderbird-android

    about: Most issues are not bugs. Ask the community for help.

.github/ISSUE_TEMPLATE/feature_request.yml

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
name: Feature request

description: Suggest an idea for K-9 Mail

labels: [ "type: enhancement", "unconfirmed" ]

body:

  - type: checkboxes

    id: checklist

    attributes:

      label: Checklist

      options:

        - label: I have used the search function to see if someone else has already submitted the same feature request.

          required: true

        - label: I will describe the problem with as much detail as possible.

          required: true

        - label: This issue only contains a request for one single feature, **not** multiple (related) features.

          required: true

  - type: input

    id: version

    attributes:

      label: App version

      description: The app version you are currently using. You can find it inside the app under *Settings → About*.

      placeholder: x.yyy

    validations:

      required: true

  - type: textarea

    id: problem

    attributes:

      label: Problem you are trying to solve

      description: Give a brief explanation of the problem you are trying to solve.

    validations:

      required: true

  - type: textarea

    id: solution

    attributes:

      label: Suggested solution

      description: Describe how you would like the app to help you solve that problem. Try to be as specific as possible.

    validations:

      required: true

  - type: textarea

    id: screenshots

    attributes:

      label: Screenshots / Drawings / Technical details

      description: |

        If your request is about (or includes) changing or extending the user interface (UI), describe what the UI would look like and how the user would interact with it.



        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.

.github/workflows/daily_builds.yml

+2 −1
Original line number Diff line number Diff line
@@ -10,4 +10,5 @@ jobs: 
    uses: ./.github/workflows/shippable_builds.yml

    secrets: inherit

    permissions:

      contents: write
 
      contents: write # For release bumps

      id-token: write # For GCS publishing (ftp.mo)

.github/workflows/needinfo-remove.yml

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ jobs: 
  build:

    runs-on: ubuntu-latest

    if: |

      contains(github.event.issue.labels.*.name, 'status: needs information') &&

      github.event.comment.author_association != 'OWNER' &&

      github.event.comment.author_association != 'MEMBER' &&

      github.event.comment.author_association != 'COLLABORATOR'
@@ -23,3 +24,10 @@ jobs: 
          curl --request DELETE \

            --url 'https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels/status%3A%20needs%20information' \

            --header 'Authorization: token ${{ secrets.GITHUB_TOKEN }}'

      - name: Add answered label

        run: |

          curl --request POST \

            --url 'https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/labels' \

            --header 'Authorization: token ${{ secrets.GITHUB_TOKEN }}' \

            --header 'Content-Type: application/json' \

            --data '{"labels": ["status: answered"]}'