Skip to content

Commit

Permalink
# Automated nightly release 67
Browse files Browse the repository at this point in the history
commit c886559
Merge: f4d73ca 09e61ae
Author: Emma <MarmadileManteater@proton.me>

Merge branch 'development' of https://github.com/MarmadileManteater/FreeTubeCordova into development

commit f4d73ca
Merge: 0e605d9 ae9d329
Author: Emma <MarmadileManteater@proton.me>

Merge 'upstream/development' into development

commit ae9d329
Author: atilluF <atilluf@outlook.com>

Translated using Weblate (Italian)

commit b2b9d97
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump electron-builder from 23.3.3 to 23.6.0 (FreeTubeApp#2705)

commit 3c7b143
Author: Emma <MarmadileManteater@proton.me>

Improving responsiveness in Settings (FreeTubeApp#2694)

commit 3af6dd7
Author: Jeff Huang <s8321414@gmail.com>

Translated using Weblate (Chinese (Traditional))

commit b127c85
Author: Eric <hamburger1024@mailbox.org>

Translated using Weblate (Chinese (Simplified))

commit 40859b5
Author: efb4f5ff-1298-471a-8973-3d47447115dc <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>

Update index.js (FreeTubeApp#2706)

commit 3db62f6
Author: gallegonovato <fran-carro@hotmail.es>

Translated using Weblate (Spanish)

commit b4bfbdc
Author: Ihor Hordiichuk <igor_ck@outlook.com>

Translated using Weblate (Ukrainian)

commit 09e61ae
Merge: 0e605d9 bdb8b17
Author: Emma <MarmadileManteater@proton.me>

Merge branch 'FreeTubeApp:development' into development

commit 0e605d9
Author: Emma <MarmadileManteater@proton.me>

Removing custom videoJS css which is no longer necessary

commit d5bc0cd
Merge: ec906ef 687352f
Author: Emma <MarmadileManteater@proton.me>

Merge remote-tracking branch 'upstream/development' into development

commit ec906ef
Merge: e202c79 7ca6440
Author: Emma <MarmadileManteater@proton.me>

Merge branch 'upstream_development' into development

commit bdb8b17
Merge: 687352f e64db7f
Author: Hosted Weblate <hosted@weblate.org>

Merge branch 'origin/development' into Weblate.

commit e64db7f
Author: Oğuz Ersen <oguz@ersen.moe>

Translated using Weblate (Turkish)

commit 66e1ff3
Author: Rex_sa <rex.sa@pm.me>

Translated using Weblate (Arabic)

commit 687352f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump mikefarah/yq from 4.27.5 to 4.28.1 (FreeTubeApp#2703)

commit 1508b05
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump lefthook from 1.1.1 to 1.1.2 (FreeTubeApp#2699)

commit b3e0cc3
Author: Preston <freetubeapp@protonmail.com>

Switch token for Flathub deployment

commit c63149d
Merge: 7fb5d47 f07aefd
Author: Hosted Weblate <hosted@weblate.org>

Merge branch 'origin/development' into Weblate.

commit f07aefd
Author: gallegonovato <fran-carro@hotmail.es>

Translated using Weblate (Spanish)

commit 7fb5d47
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump yt-channel-info from 3.1.0 to 3.1.1 (FreeTubeApp#2702)

commit 5106868
Author: efb4f5ff-1298-471a-8973-3d47447115dc <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>

Update report.yml (FreeTubeApp#2704)

commit ce24739
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump mini-css-extract-plugin from 2.6.0 to 2.6.1 (FreeTubeApp#2701)

commit 48fe90e
Merge: 22a5062 03cb0db
Author: Hosted Weblate <hosted@weblate.org>

Merge branch 'origin/development' into Weblate.

commit 03cb0db
Author: gallegonovato <fran-carro@hotmail.es>

Translated using Weblate (Galician)

commit eeeb903
Author: Florin Voicu <florin.bkk@gmail.com>

Translated using Weblate (Romanian)

commit 74f57b7
Author: HexagonCDN <ctyducliem2006@gmail.com>

Translated using Weblate (Vietnamese)

commit 22a5062
Author: absidue <48293849+absidue@users.noreply.github.com>

Move calculateColorLuminance, calculatePublishedDate and buildVTTFileLocally out of the store (FreeTubeApp#2692)

commit 7ca6440
Author: Aiz <66974576+Aiz0@users.noreply.github.com>

Add shortcuts for refresh buttons on Subscription, Trending, and Popular views (FreeTubeApp#2689)

commit aa4a01b
Author: absidue <48293849+absidue@users.noreply.github.com>

Cleanup the web webpack config (FreeTubeApp#2690)

commit 41fee01
Author: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>

Improve Importing Subscriptions (FreeTubeApp#2604)

commit 2154255
Author: efb4f5ff-1298-471a-8973-3d47447115dc <73130443+efb4f5ff-1298-471a-8973-3d47447115dc@users.noreply.github.com>

Advertise FT better in README (FreeTubeApp#2677)

**Full Changelog**: 0.17.1-nightly-66...0.17.1-nightly-67
  • Loading branch information
MarmadileManteater committed Oct 11, 2022
2 parents c437775 + c886559 commit 23a8014
Show file tree
Hide file tree
Showing 37 changed files with 750 additions and 750 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v3
with:
repository: flathub/io.freetubeapp.FreeTube
token: ${{ secrets.PUSH_TOKEN }}
token: ${{ secrets.FLATHUB_TOKEN }}
- name: GitHub API exec action
uses: moustacheful/github-api-exec-action@v0
id: api_results
Expand Down Expand Up @@ -77,22 +77,22 @@ jobs:
date +"%Y-%m-%d" >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
- name: Update x64 File Location in yml File
uses: mikefarah/yq@v4.27.5
uses: mikefarah/yq@v4.28.1
with:
# The Command which should be run
cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].url 'https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-x64.zip'
- name: Update x64 Hash in yml File
uses: mikefarah/yq@v4.27.5
uses: mikefarah/yq@v4.28.1
with:
# The Command which should be run
cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[0].sha256 ${{ env.HASH_X64 }}
- name: Update ARM File Location in yml File
uses: mikefarah/yq@v4.27.5
uses: mikefarah/yq@v4.28.1
with:
# The Command which should be run
cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].url 'https://github.com/FreeTubeApp/FreeTube/releases/download/v${{ steps.sub.outputs.result }}-beta/freetube-${{ steps.sub.outputs.result }}-linux-portable-arm64.zip'
- name: Update ARM Hash in yml File
uses: mikefarah/yq@v4.27.5
uses: mikefarah/yq@v4.28.1
with:
# The Command which should be run
cmd: yq w -i io.freetubeapp.FreeTube.yml modules[0].sources[1].sha256 ${{ env.HASH_ARM64 }}
Expand All @@ -108,7 +108,7 @@ jobs:
# Optional but recommended
# Defaults to "Apply automatic changes"
commit_message: Update files for v${{ steps.sub.outputs.result }}
token: ${{ secrets.PUSH_TOKEN }}
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 All @@ -118,7 +118,7 @@ jobs:
skip_dirty_check: true
- name: Create PR
run: |
echo ${{ secrets.PUSH_TOKEN }} >> auth.txt
echo ${{ secrets.FLATHUB_TOKEN }} >> auth.txt
gh auth login --with-token < auth.txt
rm auth.txt
gh pr create --title "Release v${{ steps.sub.outputs.result }}" --body "This is an automated PR for the v${{ steps.sub.outputs.result }} release. This PR will be updated and merged once testing is complete."
36 changes: 28 additions & 8 deletions .github/workflows/report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: Project Board Automation

on:
issues:
types: [labeled, unlabeled, closed, deleted]
types: [closed, deleted, reopened, opened]

jobs:
assign-issues-to-projects:
Expand All @@ -14,37 +14,57 @@ jobs:
# For bug reports
- name: New bug issue
uses: alex-page/github-project-automation-plus@v0.8.1
if: github.event.action == 'labeled' && contains(github.event.issue.labels.*.name, 'bug')
if: contains(github.event.issue.labels.*.name, 'bug') && github.event.action == 'opened'
with:
project: Bug Reports
column: To assign
repo-token: ${{ secrets.PUSH_TOKEN }}
action: update

- name: Bug label removed
- name: Bug issue closed
uses: alex-page/github-project-automation-plus@v0.8.1
if: github.event.action == 'unlabeled' || github.event.action == 'closed' || github.event.action == 'deleted'
if: github.event.action == 'closed' || github.event.action == 'deleted'
with:
action: delete
project: Bug Reports
column: To assign
repo-token: ${{ secrets.PUSH_TOKEN }}

- name: Bug issue reopened
uses: alex-page/github-project-automation-plus@v0.8.1
if: contains(github.event.issue.labels.*.name, 'bug') && github.event.action == 'reopened'
with:
project: Bug Reports
column: To assign
repo-token: ${{ secrets.PUSH_TOKEN }}
action: update

# For feature requests
- name: New feature issue
uses: alex-page/github-project-automation-plus@v0.8.1
if: github.event.action == 'labeled' && contains(github.event.issue.labels.*.name, 'enhancement')
if: contains(github.event.issue.labels.*.name, 'enhancement') && github.event.action == 'opened'
with:
project: Feature Requests
column: To assign
repo-token: ${{ secrets.PUSH_TOKEN }}
action: update

- name: Feature request label removed
- name: Feature request issue closed
uses: alex-page/github-project-automation-plus@v0.8.1
if: github.event.action == 'unlabeled' || github.event.action == 'closed' || github.event.action == 'deleted'
if: github.event.action == 'closed' || github.event.action == 'deleted'
with:
action: delete
project: Feature Requests
column: To assign
repo-token: ${{ secrets.PUSH_TOKEN }}

- name: Feature request issue reopened
uses: alex-page/github-project-automation-plus@v0.8.1
if: contains(github.event.issue.labels.*.name, 'enhancement') && github.event.action == 'reopened'
with:
project: Feature Requests
column: To assign
repo-token: ${{ secrets.PUSH_TOKEN }}
action: update


75 changes: 35 additions & 40 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,63 +43,71 @@ FreeTube is an open source desktop YouTube player built with privacy in mind.
Use YouTube without advertisements and prevent Google from tracking you with their cookies and JavaScript.
Available for Windows, Mac & Linux thanks to Electron.

Please note that FreeTube is currently in Beta. While it should work well for
most users, there are still bugs and missing features that need to be
addressed.

<p align="center"><a href="https://github.com/FreeTubeApp/FreeTube/releases">Download FreeTube</a></p>

<hr>
<p align="center"><a href="#browser-extension">Browser Extension</a> &bull; <a href="#how-does-it-work">How does it work?</a> &bull; <a href="#screenshots">Screenshots</a> &bull; <a href="#features">Features</a> &bull; <a href="#download-links">Download Links</a> &bull; <a href="#contributing">Contributing</a> &bull; <a href="#localization">Localization</a> &bull; <a href="#contact">Contact</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
<p align="center"><a href="#screenshots">Screenshots</a> &bull; <a href="#how-does-it-work">How does it work?</a> &bull; <a href="#features">Features</a> &bull; <a href="#download-links">Download Links</a> &bull; <a href="#contributing">Contributing</a> &bull; <a href="#localization">Localization</a> &bull; <a href="#contact">Contact</a> &bull; <a href="#donate">Donate</a> &bull; <a href="#license">License</a></p>
<p align="center"><a href="https://freetubeapp.io/">Website</a> &bull; <a href="https://blog.freetubeapp.io/">Blog</a> &bull; <a href="https://docs.freetubeapp.io/">Documentation</a> &bull; <a href="https://docs.freetubeapp.io/faq/">FAQ</a> &bull; <a href="https://github.com/FreeTubeApp/FreeTube/discussions">Discussions</a></p>
<hr>

## Browser Extension

FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube. You must enable the option within the advanced settings for it to work.
<b>Please note that FreeTube is currently in Beta. While it should work well for most users, there are still bugs and missing features that need to be addressed. If you have an idea or if you found a bug, please submit a [GitHub issue](https://github.com/FreeTubeApp/FreeTube/issues/new/choose) so that
we can track it. Please search [the existing issues](https://github.com/FreeTubeApp/FreeTube/issues) before submitting to
prevent duplicates!</b>

* Download Privacy Redirect for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/) or [Google Chrome](https://chrome.google.com/webstore/detail/privacy-redirect/pmcmeagblkinmogikoikkdjiligflglb).

* Download LibRedirect for [Firefox](https://addons.mozilla.org/firefox/addon/libredirect/) or [Google Chrome](https://github.com/libredirect/libredirect/blob/master/chromium.md).

Disclaimer: Learn more about why a browser extension is bad for your [privacy](https://www.privacyguides.org/desktop-browsers/#additional-resources).

If you have issues with the extension working with FreeTube, please create an issue in this repository instead of the extension repository.
## Screenshots
<img src="https://i.imgur.com/zFgZUUV.png" width=300> <img src="https://i.imgur.com/9evYHgN.png" width=300> <img src="https://i.imgur.com/yT2UzPa.png" width=300> <img src="https://i.imgur.com/47zIEt4.png" width=300> <img src="https://i.imgur.com/hFB2fKC.png" width=300>

## How does it work?
FreeTube uses a built in extractor to grab and serve data / videos. The [Invidious API](https://github.com/iv-org/invidious) can also optionally be used. FreeTube does not use any official APIs to obtain data. While YouTube can still see your video requests, it can no
longer track you using cookies or JavaScript. Your subscriptions and history are stored locally on your computer and never sent out. Using a VPN or Tor is highly recommended
to hide your IP while using FreeTube.

Go to [FreeTube's Documentation](https://docs.freetubeapp.io/) if you'd like to know more about how to operate FreeTube and its features.

## Screenshots
<img src="https://i.imgur.com/zFgZUUV.png" width=300> <img src="https://i.imgur.com/9evYHgN.png" width=300> <img src="https://i.imgur.com/yT2UzPa.png" width=300> <img src="https://i.imgur.com/47zIEt4.png" width=300> <img src="https://i.imgur.com/hFB2fKC.png" width=300>

## Features
* Watch videos without ads
* Use YouTube without Google tracking you using cookies and JavaScript
* Two extractor APIs to choose from (Built in or Invidious)
* Subscribe to channels without an account
* Local subscriptions, history, and saved videos
* Connect to an externally setup proxy such as Tor
* View and search your local subscriptions, history, and saved videos
* Organize your subscriptions into "Profiles" to create a more focused feed
* Export & import subscriptions
* Youtube Trending
* Youtube Chapters
* Most popular videos page based on the set Invidious instance
* SponsorBlock
* Open videos from your browser directly into FreeTube (with extension)
* Mini Player
* Watch videos using an external player
* Full Theme support
* Make a screenshot of a video
* Multiple windows
* Mini Player (Picture-in-Picture)
* Keyboard shortcuts
* Option to show only family friendly content
* Show/hide functionality or elements within the app using the distraction free settings

## Download Links
### Browser Extension
FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube. You must enable the option within the advanced settings of the extension for it to work.

### Official Downloads
* Download Privacy Redirect for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/) or [Google Chrome](https://chrome.google.com/webstore/detail/privacy-redirect/pmcmeagblkinmogikoikkdjiligflglb).

* Download LibRedirect for [Firefox](https://addons.mozilla.org/firefox/addon/libredirect/) or [Google Chrome](https://github.com/libredirect/libredirect/blob/master/chromium.md).

If you have issues with the extension working with FreeTube, please create an issue in this repository instead of the extension repository. This extension does not work on Linux portable builds!

## Download Links
### Official Downloads
* [GitHub Releases](https://github.com/FreeTubeApp/FreeTube/releases)

* [FreeTube Website](https://freetubeapp.io/#download)

* Flatpak on Flathub: [Download](https://flathub.org/apps/details/io.freetubeapp.FreeTube) [Source](https://github.com/flathub/io.freetubeapp.FreeTube)

### Unofficial Downloads
#### Automated Builds (Nightly / Weekly)
Builds are automatically created from changes to our development branch via [GitHub Actions](https://github.com/FreeTubeApp/FreeTube/actions?query=workflow%3ABuild).

The first build with a green check mark is the latest build. You will need to have a GitHub account to download these builds.

### Unofficial Downloads
These builds are maintained by the community. While they should be safe, download at your own risk. There may be issues with using these versus the official builds. Any issues specific with these builds should be sent to their respective maintainer.

* Arch User Repository (AUR): [Download](https://aur.archlinux.org/packages/freetube-bin/)
Expand All @@ -114,17 +122,7 @@ These builds are maintained by the community. While they should be safe, downlo

* Windows Package Manager (winget): [Usage](https://docs.microsoft.com/en-us/windows/package-manager/winget/)

### Automated Builds (Nightly / Weekly)

Builds are automatically created from changes to our development branch via [GitHub Actions](https://github.com/FreeTubeApp/FreeTube/actions?query=workflow%3ABuild).

The first build with a green check mark is the latest build. You will need to have a GitHub account to download these builds.

## Contributing
If you have an idea or if you found a bug, please submit a GitHub issue so that
we can track it. Please search the existing issues before submitting to
prevent duplicates.

If you like to get your hands dirty and want to contribute, we would love to
have your help. Send a pull request and someone will review your code. Please
follow the [Contribution
Expand All @@ -135,18 +133,15 @@ Thank you very much to the [People and Projects](https://docs.freetubeapp.io/cre

## Localization
<a href="https://hosted.weblate.org/engage/free-tube/">
<img src="https://hosted.weblate.org/widgets/free-tube/-/translations/287x66-grey.png" alt="Translation status" />
<img src="https://hosted.weblate.org/widgets/free-tube/-/287x66-grey.png" alt="Translation status" />
</a>

We are actively looking for translations! We use [Weblate](https://hosted.weblate.org/engage/free-tube/) to make it easy for translators to get involved. Click on the badge above to learn how to get involved.

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 make an issue here on GitHub. Alternatively, you can email me at FreeTubeApp@protonmail.com or you can join our [Matrix Community](https://matrix.to/#/+freetube:matrix.org). Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.

You can also stay up to date by reading the [FreeTube Blog](https://write.as/freetube/). [View the welcome blog](https://write.as/freetube/welcome-to-freetube-blogs).
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 FreeTubeApp@protonmail.com or you can join our [Matrix Community](https://matrix.to/#/+freetube:matrix.org). Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.

## Donate
If you enjoy using FreeTube, you're welcome to leave a donation using the following methods.
Expand Down
12 changes: 1 addition & 11 deletions _scripts/webpack.web.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,7 @@ const config = {
},
{
test: /\.vue$/,
use: {
loader: 'vue-loader',
options: {
extractCSS: true,
loaders: {
sass: 'vue-style-loader!css-loader!sass-loader?indentedSyntax=1',
scss: 'vue-style-loader!css-loader!sass-loader',
less: 'vue-style-loader!css-loader!less-loader',
},
},
},
loader: 'vue-loader'
},
{
test: /\.s(c|a)ss$/,
Expand Down
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"vue-router": "^3.6.5",
"vuex": "^3.6.2",
"youtube-suggest": "^1.2.0",
"yt-channel-info": "^3.1.0",
"yt-channel-info": "^3.1.1",
"yt-dash-manifest-generator": "1.1.0",
"ytdl-core": "^4.11.2",
"ytpl": "^2.3.0",
Expand All @@ -99,7 +99,7 @@
"css-loader": "^6.7.1",
"css-minimizer-webpack-plugin": "^4.1.0",
"electron": "^20.3.1",
"electron-builder": "^23.3.3",
"electron-builder": "^23.6.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-config-standard": "^16.0.3",
Expand All @@ -112,19 +112,17 @@
"html-webpack-plugin": "^5.3.2",
"js-yaml": "^4.1.0",
"json-minimizer-webpack-plugin": "^4.0.0",
"lefthook": "^1.1.1",
"mini-css-extract-plugin": "^2.2.2",
"lefthook": "^1.1.2",
"mini-css-extract-plugin": "^2.6.1",
"npm-run-all": "^4.1.5",
"prettier": "^2.3.2",
"rimraf": "^3.0.2",
"sass": "^1.54.9",
"sass-loader": "^13.0.2",
"style-loader": "^3.2.1",
"tree-kill": "1.2.2",
"vue-devtools": "^5.1.4",
"vue-eslint-parser": "^9.1.0",
"vue-loader": "^15.10.0",
"vue-style-loader": "^4.1.3",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.10.1"
Expand Down
2 changes: 1 addition & 1 deletion src/main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function runApp() {
showCopyImageAddress: true,
prepend: (defaultActions, parameters, browserWindow) => [
{
label: 'Show Video Statistics',
label: 'Show / Hide Video Statistics',
visible: parameters.mediaType === 'video',
click: () => {
browserWindow.webContents.send('showVideoStatistics')
Expand Down
Loading

0 comments on commit 23a8014

Please sign in to comment.