Skip to content

Commit

Permalink
Merge branch 'new-potokens' into custom-builds/tmp
Browse files Browse the repository at this point in the history
* 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)
  ...
  • Loading branch information
PikachuEXE committed Mar 3, 2025
2 parents 01e40d9 + fe390f5 commit e910c0d
Show file tree
Hide file tree
Showing 88 changed files with 3,108 additions and 1,781 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ contact_links:
url: https://github.com/FreeTubeApp/FreeTube/discussions/categories/q-a
about: Ask and answer questions
- name: Matrix Community
url: https://matrix.to/#/+freetube:matrix.org
url: https://matrix.to/#/#freetube:matrix.org
about: 'Join our Matrix chatroom - "Note: Bugs and Feature requests should be made on GitHub and not in the Matrix room"'
- name: Translate FreeTube
url: https://hosted.weblate.org/engage/free-tube/
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,16 @@ jobs:
with:
repository: flathub/io.freetubeapp.FreeTube
token: ${{ secrets.FLATHUB_TOKEN }}
- name: GitHub API exec action
- name: Get Repo Release List
uses: moustacheful/github-api-exec-action@v0
id: api_results
id: list_results
with:
# Command to execute, (e.g: `pulls.create`), see https://octokit.github.io/rest.js/ for available commands
command: repos.getRelease
command: repos.listReleases
payload: >
{
"owner": "FreeTubeApp",
"repo": "FreeTube",
"release_id": ${{ secrets.UPLOAD_ID }}
"repo": "FreeTube"
}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -39,7 +38,7 @@ jobs:
uses: bluwy/substitute-string-action@v3
id: sub
with:
_input-text: ${{ fromJson(steps.api_results.outputs.result).tag_name }}
_input-text: ${{ fromJson(steps.list_results.outputs.result)[0].tag_name }}
-beta: ''
v: ''
- name: Create Release Branch
Expand Down Expand Up @@ -97,7 +96,7 @@ jobs:
# The Command which should be run
cmd: yq -i '.modules[0].sources[1].sha256 = "${{ env.HASH_ARM64 }}"' io.freetubeapp.FreeTube.yml
- name: Add Patch Notes to XML File
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
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
- name: Remove Release Files
run: |
rm freetube-${{ steps.sub.outputs.result }}-linux-x64-portable.zip
Expand All @@ -108,7 +107,6 @@ jobs:
# Optional but recommended
# Defaults to "Apply automatic changes"
commit_message: Update files for v${{ steps.sub.outputs.result }}
token: ${{ secrets.FLATHUB_TOKEN }}

# Optional options appended to `git-commit`
# See https://git-scm.com/docs/git-commit for a list of available options
Expand Down
35 changes: 0 additions & 35 deletions .stylelintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Please follow these guidelines before starting to code you feature or bugfix.
* 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.
* 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.
* 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.
* 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.

## Before your Pull Request
Please follow these guidelines before sending your pull request and making contributions.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ We are actively looking for translations! We use [Weblate](https://hosted.webla
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).

## Contact
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).
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).

> [!IMPORTANT]
> Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.
Expand Down
1 change: 1 addition & 0 deletions _icons/iconEverforestDarkHardSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions _icons/iconEverforestDarkLowSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions _icons/iconEverforestDarkMediumSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions _icons/iconEverforestLightHardSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions _icons/iconEverforestLightLowSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions _icons/iconEverforestLightMediumSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions _icons/textEverforestDarkHardSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions _icons/textEverforestDarkLowSmall.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e910c0d

Please sign in to comment.