Skip to content

Commit e910c0d

Browse files
committed
Merge branch 'new-potokens' into custom-builds/tmp
* new-potokens: (56 commits) Implement content and session PO tokens Migrate ProxySettings to the composition API (FreeTubeApp#6946) Apply proxy settings to the PO token web views (FreeTubeApp#6922) Translated using Weblate (Turkish) Translated using Weblate (Bengali) Translated using Weblate (English (United Kingdom)) Translated using Weblate (Bengali) Migrate FtShareButton to composition api (FreeTubeApp#6919) Translated using Weblate (Romanian) IV: fix loading community tab (FreeTubeApp#6933) Translated using Weblate (Serbian) Translated using Weblate (Afrikaans) Translated using Weblate (Dutch) Translated using Weblate (Dutch) Translated using Weblate (Polish) Translated using Weblate (German) Translated using Weblate (Afrikaans) Translated using Weblate (Nepali) Translated using Weblate (Czech) Translated using Weblate (Afrikaans) ...
2 parents 01e40d9 + fe390f5 commit e910c0d

File tree

88 files changed

+3108
-1781
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3108
-1781
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ contact_links:
77
url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
88
about: Ask and answer questions
99
- name: Matrix Community
10-
url: https://matrix.to/#/+freetube:matrix.org
10+
url: https://matrix.to/#/#freetube:matrix.org
1111
about: 'Join our Matrix chatroom - "Note: Bugs and Feature requests should be made on GitHub and not in the Matrix room"'
1212
- name: Translate FreeTube
1313
url: https://hosted.weblate.org/engage/free-tube/

.github/workflows/flatpak.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,16 @@ jobs:
1919
with:
2020
repository: flathub/io.freetubeapp.FreeTube
2121
token: ${{ secrets.FLATHUB_TOKEN }}
22-
- name: GitHub API exec action
22+
- name: Get Repo Release List
2323
uses: moustacheful/github-api-exec-action@v0
24-
id: api_results
24+
id: list_results
2525
with:
2626
# Command to execute, (e.g: `pulls.create`), see https://octokit.github.io/rest.js/ for available commands
27-
command: repos.getRelease
27+
command: repos.listReleases
2828
payload: >
2929
{
3030
"owner": "FreeTubeApp",
31-
"repo": "FreeTube",
32-
"release_id": ${{ secrets.UPLOAD_ID }}
31+
"repo": "FreeTube"
3332
}
3433
env:
3534
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -39,7 +38,7 @@ jobs:
3938
uses: bluwy/substitute-string-action@v3
4039
id: sub
4140
with:
42-
_input-text: ${{ fromJson(steps.api_results.outputs.result).tag_name }}
41+
_input-text: ${{ fromJson(steps.list_results.outputs.result)[0].tag_name }}
4342
-beta: ''
4443
v: ''
4544
- name: Create Release Branch
@@ -97,7 +96,7 @@ jobs:
9796
# The Command which should be run
9897
cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml
9998
- name: Add Patch Notes to XML File
100-
run: xmlstarlet ed -L -i /application/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
99+
run: xmlstarlet ed -L -i /component/releases/release[1] -t elem -n releaseTMP -v "" -i //releaseTMP -t attr -n version -v "${{ steps.sub.outputs.result }} Beta" -i //releaseTMP -t attr -n date -v "${{ env.CURRENT_DATE }}" -s //releaseTMP -t elem -n url -v "" -s //releaseTMP/url -t text -n "" -v "https://github.com/FreeTubeApp/FreeTube/releases/tag/v${{ steps.sub.outputs.result }}-beta" -r //releaseTMP -v "release" io.freetubeapp.FreeTube.metainfo.xml
101100
- name: Remove Release Files
102101
run: |
103102
rm freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip
@@ -108,7 +107,6 @@ jobs:
108107
# Optional but recommended
109108
# Defaults to "Apply automatic changes"
110109
commit_message: Update files for v${{ steps.sub.outputs.result }}
111-
token: ${{ secrets.FLATHUB_TOKEN }}
112110

113111
# Optional options appended to `git-commit`
114112
# See https://git-scm.com/docs/git-commit for a list of available options

.stylelintrc.json

Lines changed: 0 additions & 35 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Please follow these guidelines before starting to code you feature or bugfix.
55
* If you want to implement a bugfix or feature request from an existing issue, please comment on that issue that you will work on it. This helps us to coordinate what needs to be done and what not.
66
* If you want to implement a feature request without an existing issue, please create an issue, so we know what you are working on and discuss the feature.
7-
* For major feature implementations make sure you are able to maintain your code in the future in regard to bugs and possible code conflicts in future updates. Optionally you could join the [Matrix](https://matrix.to/#/+freetube:matrix.org) channel, so you will hear instantly if something needs to be worked on.
7+
* For major feature implementations make sure you are able to maintain your code in the future in regard to bugs and possible code conflicts in future updates. Optionally you could join the [Matrix](https://matrix.to/#/#freetube:matrix.org) channel, so you will hear instantly if something needs to be worked on.
88

99
## Before your Pull Request
1010
Please follow these guidelines before sending your pull request and making contributions.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ We are actively looking for translations! We use [Weblate](https://hosted.webla
149149
For the Linux Flatpak, the desktop entry comment string can be translated at our [Flatpak repository](https://github.com/flathub/io.freetubeapp.FreeTube/blob/master/io.freetubeapp.FreeTube.desktop).
150150

151151
## Contact
152-
If you ever have any questions, feel free to ask it on our [Discussions](https://github.com/FreeTubeApp/FreeTube/discussions) page. Alternatively, you can email us at [email protected] or you can join our [Matrix Community](https://matrix.to/#/+freetube:matrix.org).
152+
If you ever have any questions, feel free to ask it on our [Discussions](https://github.com/FreeTubeApp/FreeTube/discussions) page. Alternatively, you can email us at [email protected] or you can join our [Matrix Community](https://matrix.to/#/#freetube:matrix.org).
153153

154154
> [!IMPORTANT]
155155
> Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.
Lines changed: 1 addition & 0 deletions
Loading

_icons/iconEverforestDarkLowSmall.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

_icons/textEverforestDarkLowSmall.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)