Merge branch 'develop'
This commit is contained in:
1
.github/workflows/release.yml
vendored
1
.github/workflows/release.yml
vendored
@@ -43,6 +43,7 @@ jobs:
|
|||||||
run: npx semantic-release
|
run: npx semantic-release
|
||||||
discord:
|
discord:
|
||||||
name: Send Discord Notification
|
name: Send Discord Notification
|
||||||
|
needs: semantic-release
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
steps:
|
steps:
|
||||||
- name: Get Build Job Status
|
- name: Get Build Job Status
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ const messages = defineMessages({
|
|||||||
request4kfrom: 'There is currently a pending 4K request from {username}',
|
request4kfrom: 'There is currently a pending 4K request from {username}',
|
||||||
errorediting: 'Something went wrong editing the request.',
|
errorediting: 'Something went wrong editing the request.',
|
||||||
requestedited: 'Request edited.',
|
requestedited: 'Request edited.',
|
||||||
|
autoapproval: 'Auto Approval',
|
||||||
});
|
});
|
||||||
|
|
||||||
interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
|
interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
|
||||||
@@ -259,7 +260,7 @@ const MovieRequestModal: React.FC<RequestModalProps> = ({
|
|||||||
hasPermission(Permission.AUTO_APPROVE) ||
|
hasPermission(Permission.AUTO_APPROVE) ||
|
||||||
hasPermission(Permission.AUTO_APPROVE_MOVIE)) && (
|
hasPermission(Permission.AUTO_APPROVE_MOVIE)) && (
|
||||||
<p className="mt-6">
|
<p className="mt-6">
|
||||||
<Alert title="Auto Approval" type="info">
|
<Alert title={intl.formatMessage(messages.autoapproval)} type="info">
|
||||||
{intl.formatMessage(messages.requestadmin)}
|
{intl.formatMessage(messages.requestadmin)}
|
||||||
</Alert>
|
</Alert>
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ const messages = defineMessages({
|
|||||||
errorediting: 'Something went wrong editing the request.',
|
errorediting: 'Something went wrong editing the request.',
|
||||||
requestedited: 'Request edited.',
|
requestedited: 'Request edited.',
|
||||||
requestcancelled: 'Request cancelled.',
|
requestcancelled: 'Request cancelled.',
|
||||||
|
autoapproval: 'Auto Approval',
|
||||||
});
|
});
|
||||||
|
|
||||||
interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
|
interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
|
||||||
@@ -313,10 +314,13 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
|
|||||||
>
|
>
|
||||||
{(hasPermission(Permission.MANAGE_REQUESTS) ||
|
{(hasPermission(Permission.MANAGE_REQUESTS) ||
|
||||||
hasPermission(Permission.AUTO_APPROVE) ||
|
hasPermission(Permission.AUTO_APPROVE) ||
|
||||||
hasPermission(Permission.AUTO_APPROVE_MOVIE)) &&
|
hasPermission(Permission.AUTO_APPROVE_TV)) &&
|
||||||
!editRequest && (
|
!editRequest && (
|
||||||
<p className="mt-6">
|
<p className="mt-6">
|
||||||
<Alert title="Auto Approval" type="info">
|
<Alert
|
||||||
|
title={intl.formatMessage(messages.autoapproval)}
|
||||||
|
type="info"
|
||||||
|
>
|
||||||
{intl.formatMessage(messages.requestadmin)}
|
{intl.formatMessage(messages.requestadmin)}
|
||||||
</Alert>
|
</Alert>
|
||||||
</p>
|
</p>
|
||||||
|
|||||||
@@ -134,6 +134,7 @@
|
|||||||
"components.RequestModal.AdvancedRequester.loadingprofiles": "Loading profiles…",
|
"components.RequestModal.AdvancedRequester.loadingprofiles": "Loading profiles…",
|
||||||
"components.RequestModal.AdvancedRequester.qualityprofile": "Quality Profile",
|
"components.RequestModal.AdvancedRequester.qualityprofile": "Quality Profile",
|
||||||
"components.RequestModal.AdvancedRequester.rootfolder": "Root Folder",
|
"components.RequestModal.AdvancedRequester.rootfolder": "Root Folder",
|
||||||
|
"components.RequestModal.autoapproval": "Auto Approval",
|
||||||
"components.RequestModal.cancel": "Cancel Request",
|
"components.RequestModal.cancel": "Cancel Request",
|
||||||
"components.RequestModal.cancelling": "Cancelling…",
|
"components.RequestModal.cancelling": "Cancelling…",
|
||||||
"components.RequestModal.cancelrequest": "This will remove your request. Are you sure you want to continue?",
|
"components.RequestModal.cancelrequest": "This will remove your request. Are you sure you want to continue?",
|
||||||
|
|||||||
Reference in New Issue
Block a user