Skip to content

Commit

Permalink
Merge branch 'master' into remember_servers
Browse files Browse the repository at this point in the history
  • Loading branch information
anthonylavado authored Apr 10, 2024
2 parents fa38725 + 7e848af commit 1e08bd1
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: node tools/gen-manifest.js build/org.jellyfin.webos.manifest.json

- name: Upload CI artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jellyfin_webos
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: security-extended

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@ This is a small wrapper around the web interface that the server provides (https

## Download

For webOS 2/3/4/5:
* Download the [latest release](https://github.com/jellyfin/jellyfin-webos/releases/latest)
* Install using Developer Mode (or other process)

For newer TVs (2021+):
For all versions:
<p align="center">
<a href="https://us.lgappstv.com/main/tvapp/detail?appId=1030579"><img alt="Enjoy on LG Smart TV" src="https://repo.jellyfin.org/releases/other/lg-badge/LG_BADGE_greyborders_135x40.png"/></a>
<br/>
<em><strong>Note:</strong> The Content Store version is currently only available for webOS 6+.</em>
<em><strong>Note:</strong> If you previously installed the app via Homebrew or Developer mode, you must uninstall that before you can use the store version.</em>
</p>


Expand Down
2 changes: 1 addition & 1 deletion frontend/appinfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"bgImage": "assets/splash.png",
"title": "Jellyfin",
"type": "web",
"version": "1.2.0",
"version": "1.2.2",
"splashBackground": "assets/splash.png",
"bgColor": "#000b25",
"vendor": "Jellyfin Project",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "org.jellyfin.webos",
"version": "1.2.0",
"version": "1.2.2",
"description": "Jellyfin WebOS client",
"scripts": {
"check": "ares-package --check",
Expand All @@ -15,6 +15,6 @@
"author": "Jellyfin contributors",
"license": "MPL-2.0",
"devDependencies": {
"@webosose/ares-cli": "^2.1.0"
"@webosose/ares-cli": "^2.4.0"
}
}

0 comments on commit 1e08bd1

Please sign in to comment.