diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index 6effae045..000000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,15 +0,0 @@ -# Global code ownership -* @sct @TheCatLady @danshilm - -# Documentation -/.all-contributorsrc @TheCatLady @samwiseg0 @danshilm -/*.md @TheCatLady @samwiseg0 @danshilm -/docs/ @TheCatLady @samwiseg0 @danshilm - -# Snap-related files -/.github/workflows/snap.yaml @samwiseg0 -/snap/ @samwiseg0 - -# i18n locale files -/src/i18n/locale/ @sct @TheCatLady -/src/i18n/locale/en.json @sct @TheCatLady @danshilm diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 28248226f..060169454 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: 💬 Support via Discord - url: https://discord.gg/overseerr + url: https://discord.gg/ckbvBtDJgC about: Chat with other users and the Overseerr dev team - name: 💬 Support via GitHub Discussions url: https://github.com/sct/overseerr/discussions diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 7590f941c..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -updates: - - package-ecosystem: npm - directory: '/' - schedule: - interval: daily - time: '20:00' - open-pull-requests-limit: 10 - - package-ecosystem: github-actions - directory: '/' - schedule: - interval: daily - time: '20:00' - open-pull-requests-limit: 10 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5aa1572dd..44215bded 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,9 @@ -name: Overseerr CI +name: Jellyseerr CI on: pull_request: branches: - - '*' + - "*" push: branches: - develop @@ -49,12 +49,6 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} - - name: Log in to GitHub Container Registry - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v2 with: @@ -65,10 +59,7 @@ jobs: build-args: | COMMIT_TAG=${{ github.sha }} tags: | - sctx/overseerr:develop - sctx/overseerr:${{ github.sha }} - ghcr.io/sct/overseerr:develop - ghcr.io/sct/overseerr:${{ github.sha }} + fallenbagel/jellyseerr:develop cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max - # Temporary fix diff --git a/.github/workflows/deploy_docs.yml b/.github/workflows/deploy_docs.yml deleted file mode 100644 index 866f61931..000000000 --- a/.github/workflows/deploy_docs.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Deploy API Docs - -on: - push: - branches: - - develop - -jobs: - deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Generate Swagger UI - uses: Legion2/swagger-ui-action@v1 - with: - output: swagger-ui - spec-file: overseerr-api.yml - - name: Deploy to GitHub Pages - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: swagger-ui - cname: api-docs.overseerr.dev diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml index 307c92634..5d104c7c8 100644 --- a/.github/workflows/preview.yml +++ b/.github/workflows/preview.yml @@ -1,9 +1,9 @@ -name: Overseerr Preview +name: Jellyseerr Preview on: push: tags: - - 'preview-*' + - "preview-*" jobs: build_and_push: @@ -24,12 +24,6 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} - - name: Log in to GitHub Container Registry - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v2 with: @@ -40,5 +34,4 @@ jobs: build-args: | COMMIT_TAG=${{ github.sha }} tags: | - sctx/overseerr:${{ steps.get_version.outputs.VERSION }} - ghcr.io/sct/overseerr:${{ steps.get_version.outputs.VERSION }} + fallenbagel/jellyseerr:${{ steps.get_version.outputs.VERSION }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8dc0b98bc..dbac47e96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,6 @@ -name: Overseerr Release +name: Jellyseer Release -on: - push: - branches: - - master +on: workflow_dispatch jobs: semantic-release: @@ -29,75 +26,14 @@ jobs: with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_TOKEN }} - - name: Log in to GitHub Container Registry - uses: docker/login-action@v1 - with: - registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - name: Install dependencies run: yarn - name: Release env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} run: npx semantic-release - build-snap: - name: Build Snap Package (${{ matrix.architecture }}) - needs: semantic-release - runs-on: ubuntu-20.04 - strategy: - fail-fast: false - matrix: - architecture: - - amd64 - - arm64 - - armhf - steps: - - name: Checkout Code - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Switch to master branch - run: git checkout master - - name: Pull latest changes - run: git pull - - name: Prepare - id: prepare - run: | - git fetch --prune --tags - if [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then - echo ::set-output name=RELEASE::stable - else - echo ::set-output name=RELEASE::edge - fi - - name: Set Up QEMU - uses: docker/setup-qemu-action@v1 - with: - image: tonistiigi/binfmt@sha256:df15403e06a03c2f461c1f7938b171fda34a5849eb63a70e2a2109ed5a778bde - - name: Build Snap Package - uses: diddlesnaps/snapcraft-multiarch-action@v1 - id: build - with: - architecture: ${{ matrix.architecture }} - - name: Upload Snap Package - uses: actions/upload-artifact@v2 - with: - name: overseerr-snap-package-${{ matrix.architecture }} - path: ${{ steps.build.outputs.snap }} - - name: Review Snap Package - uses: diddlesnaps/snapcraft-review-tools-action@v1 - with: - snap: ${{ steps.build.outputs.snap }} - - name: Publish Snap Package - uses: snapcore/action-publish@v1 - with: - store_login: ${{ secrets.SNAP_LOGIN }} - snap: ${{ steps.build.outputs.snap }} - release: ${{ steps.prepare.outputs.RELEASE }} - discord: name: Send Discord Notification needs: semantic-release diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml index f562333b8..8b45dcdc5 100644 --- a/.github/workflows/support.yml +++ b/.github/workflows/support.yml @@ -16,11 +16,10 @@ jobs: :wave: @{issue-author}, we use the issue tracker exclusively for bug reports and feature requests. However, this issue appears to be a support request. Please use our support channels - to get help with Overseerr. + to get help with Jellyseerr. - - [Discord](https://discord.gg/overseerr) + - [Discord](https://discord.gg/ckbvBtDJgC) - - [GitHub Discussions](https://github.com/sct/overseerr/discussions) close-issue: true lock-issue: true issue-lock-reason: 'off-topic' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e54e45d67..35c1f21c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,7 +76,7 @@ All help is welcome and greatly appreciated! If you would like to contribute to - You can create a "draft" pull request early to get feedback on your work. - Your code **must** be formatted correctly, or the tests will fail. - We use Prettier to format our code base. It should automatically run with a Git hook, but it is recommended to have the Prettier extension installed in your editor and format on save. -- If you have questions or need help, you can reach out via [Discussions](https://github.com/sct/overseerr/discussions) or our [Discord server](https://discord.gg/overseerr). +- If you have questions or need help, you can reach out via [Discussions](https://github.com/sct/overseerr/discussions) or our [Discord server](https://discord.gg/ckbvBtDJgC). - Only open pull requests to `develop`, never `master`! Any pull requests opened to `master` will be closed. ### UI Text Style diff --git a/README.md b/README.md index 6bca69eb0..f1604d750 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ Overseerr CI

-Discord -Docker pulls +Discord +Docker pulls Translation status Language grade: JavaScript GitHub @@ -44,7 +44,7 @@ https://docs.overseerr.dev/getting-started/installation ## Support - Check out the [Overseerr Documentation](https://docs.overseerr.dev/) before asking for help. Your question might already be in the [FAQ](https://docs.overseerr.dev/support/faq). -- You can get support on [Discord](https://discord.gg/overseerr). +- You can get support on [Discord](https://discord.gg/ckbvBtDJgC). - You can ask questions in the Help category of our [GitHub Discussions](https://github.com/sct/overseerr/discussions). - Bug reports and feature requests can be submitted via [GitHub Issues](https://github.com/sct/overseerr/issues). @@ -58,7 +58,7 @@ You can also access the API documentation from your local Overseerr install at h You can ask questions, share ideas, and more in [GitHub Discussions](https://github.com/sct/overseerr/discussions). -If you would like to chat with other members of our growing community, [join the Overseerr Discord server](https://discord.gg/overseerr)! +If you would like to chat with other members of our growing community, [join the Overseerr Discord server](https://discord.gg/ckbvBtDJgC)! Our [Code of Conduct](https://github.com/sct/overseerr/blob/develop/CODE_OF_CONDUCT.md) applies to all Overseerr community channels. diff --git a/docs/getting-started/installation.md b/docs/getting-started/installation.md index 98e26f59f..957c9a51b 100644 --- a/docs/getting-started/installation.md +++ b/docs/getting-started/installation.md @@ -1,7 +1,7 @@ # Installation {% hint style="danger" %} -**Overseerr is currently in BETA.** If you would like to help test the bleeding edge, please use the image **`sctx/overseerr:develop`**! +**Overseerr is currently in BETA.** If you would like to help test the bleeding edge, please use the image **`fallenbagel/jellyseerr:develop`**! {% endhint %} {% hint style="info" %} @@ -31,7 +31,7 @@ docker run -d \ -p 5055:5055 \ -v /path/to/appdata/config:/app/config \ --restart unless-stopped \ - sctx/overseerr + fallenbagel/jellyseerr ``` To run the container as a specific user/group, you may optionally add `--user=[ user | user:group | uid | uid:gid | user:gid | uid:group ]` to the above command. @@ -47,7 +47,7 @@ docker stop overseerr && docker rm overseerr Pull the latest image: ```bash -docker pull sctx/overseerr +docker pull fallenbagel/jellyseerr ``` Finally, run the container with the same parameters originally used to create the container: @@ -76,7 +76,7 @@ version: '3' services: overseerr: - image: sctx/overseerr:latest + image: fallenbagel/jellyseerr:latest container_name: overseerr environment: - LOG_LEVEL=debug @@ -143,7 +143,7 @@ or the Docker Desktop app: Then, create and start the Overseerr container: ```bash -docker run -d --name overseerr -e LOG_LEVEL=debug -e TZ=Asia/Tokyo -p 5055:5055 -v "overseerr-data:/app/config" --restart unless-stopped sctx/overseerr:latest +docker run -d --name overseerr -e LOG_LEVEL=debug -e TZ=Asia/Tokyo -p 5055:5055 -v "overseerr-data:/app/config" --restart unless-stopped fallenbagel/jellyseerr:latest ``` If using a named volume like above, you can safely ignore the warning about the `/app/config` folder being incorrectly mounted on the setup page. diff --git a/docs/support/faq.md b/docs/support/faq.md index d3ea3cdce..e13ccd544 100644 --- a/docs/support/faq.md +++ b/docs/support/faq.md @@ -1,7 +1,7 @@ # Frequently Asked Questions (FAQ) {% hint style="info" %} -If you can't find the solution to your problem here, please read [Need Help?](./need-help.md) and reach out to us on [Discord](https://discord.gg/overseerr). +If you can't find the solution to your problem here, please read [Need Help?](./need-help.md) and reach out to us on [Discord](https://discord.gg/ckbvBtDJgC). _Please do not post questions or support requests on the GitHub issue tracker!_ {% endhint %} diff --git a/docs/support/need-help.md b/docs/support/need-help.md index 2d4782529..4d31f5d50 100644 --- a/docs/support/need-help.md +++ b/docs/support/need-help.md @@ -9,7 +9,7 @@ Before seeking assistance, please make sure you have first tried these following - **Analyzing** your logs, you just might find the solution yourself! - **Searching** the [documentation](../README.md), [installation guide](../getting-started/installation.md), and [FAQs](./faq.md). -If you still have questions after troubleshooting on your own, feel free to ask on [Discord](https://discord.gg/overseerr)! (Please review our [Code of Conduct](https://github.com/sct/overseerr/blob/develop/CODE_OF_CONDUCT.md) before posting.) +If you still have questions after troubleshooting on your own, feel free to ask on [Discord](https://discord.gg/ckbvBtDJgC)! (Please review our [Code of Conduct](https://github.com/sct/overseerr/blob/develop/CODE_OF_CONDUCT.md) before posting.) Be sure to also include a link to your logs. (Please see [How can I share my logs?](#how-can-i-share-my-logs) below.) @@ -42,4 +42,4 @@ Try to answer the following questions: 1. Locate the current log file at `/logs/overseerr.log`. 2. Open the log file and **copy its contents** into a [**secret gist** on GitHub](https://gist.github.com/). If you upload your logs elsewhere, we may ask you to share them again via GitHub Gist. -3. **Share the link/URL to your secret gist** in the [`#support` channel in our Discord server](https://discord.gg/overseerr). +3. **Share the link/URL to your secret gist** in the [`#support` channel in our Discord server](https://discord.gg/ckbvBtDJgC). diff --git a/package.json b/package.json index 4e708f1fd..7e885c776 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "overseerr", + "name": "jellyseerr", "version": "1.29.1", "private": true, "scripts": { @@ -197,7 +197,7 @@ ] ], "branches": [ - "master" + "main" ], "npmPublish": false, "publish": [ @@ -207,8 +207,7 @@ "COMMIT_TAG": "$GITHUB_SHA" }, "imageNames": [ - "sctx/overseerr", - "ghcr.io/sct/overseerr" + "fallenbagel/jellyseerr" ], "platforms": [ "linux/amd64", @@ -219,4 +218,4 @@ "@semantic-release/github" ] } -} +} \ No newline at end of file diff --git a/src/components/Settings/SettingsAbout/index.tsx b/src/components/Settings/SettingsAbout/index.tsx index 2b638108f..edaffd795 100644 --- a/src/components/Settings/SettingsAbout/index.tsx +++ b/src/components/Settings/SettingsAbout/index.tsx @@ -178,12 +178,12 @@ const SettingsAbout: React.FC = () => { - https://discord.gg/overseerr + https://discord.gg/ckbvBtDJgC