mirrors/oneuptime
1
0
Fork 0
mirror of https://github.com/OneUptime/oneuptime synced 2024-11-21 22:59:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into moar-copyedit

Browse Source
This commit is contained in:
Carl Downing 2023-07-30 14:21:27 -07:00
commit 3da963d923
11 changed files with 53 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
.github/workflows/release.yml vendored
View File

@ -28,7 +28,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- run: echo "${{needs.generate-build-number.outputs.build_number}}"
- name: "Build Changelog"
id: build_changelog
@ -59,7 +59,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -118,7 +118,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -177,7 +177,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -236,7 +236,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -295,7 +295,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -354,7 +354,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -413,7 +413,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -472,7 +472,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -531,7 +531,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -590,7 +590,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -649,7 +649,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -708,7 +708,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -767,7 +767,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -826,7 +826,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -885,7 +885,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -944,7 +944,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -1003,7 +1003,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -1062,7 +1062,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -1121,7 +1121,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -1180,7 +1180,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:
@ -1239,7 +1239,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: release
ref: ${{ github.ref }}
- uses: actions/setup-node@v2
with:

8
Accounts/public/index.html
View File

@ -5,14 +5,12 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta charSet='utf-8' />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<meta name="slack-app-id" content="ACVBMTPJQ">
<meta name="description" content="This is the login page for OneUptime Dashboard">
<meta name="description" content="OneUptime — the complete open-source observability platform.">
<!-- Google Tag Manager -->
<script>(function (w, d, s, l, i) {
@ -41,8 +39,8 @@
<script src="/accounts/env.js"></script>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
<style>
* {
font-family: Inter;

6
Common/Types/Permission.ts
View File

@ -2537,11 +2537,13 @@ export function instanceOfUserTenantAccessPermission(
return object._type === 'UserTenantAccessPermission';
}
export function instaceOfUserPermission(object: any): object is UserPermission {
export function instanceOfUserPermission(
object: any
): object is UserPermission {
return object._type === 'UserPermission';
}
export function instaceOfUserGlobalAccessPermission(
export function instanceOfUserGlobalAccessPermission(
object: any
): object is UserGlobalAccessPermission {
return object._type === 'UserGlobalAccessPermission';

6
CommonServer/Services/NotificationService.ts
View File

@ -62,11 +62,11 @@ export class NotificationService extends BaseService {
(project.name || ''),
`We have tried to recharge your SMS and Call balance for project - ${
project.name || ''
} and failed. We could not find a payment method for the project. Please add a payment method in project settings.`
} and failed. We could not find a payment method for the project. Please add a payment method in Project Settings.`
);
}
throw new BadDataException(
'No payment methods found for the project. Please add a payment method in project settings to continue.'
'No payment methods found for the project. Please add a payment method in Project Settings to continue.'
);
}
@ -127,7 +127,7 @@ export class NotificationService extends BaseService {
(project.name || ''),
`We have tried recharged your SMS and Call balance for project - ${
project.name || ''
} and failed. Please make sure your payment method is upto date and has sufficient balance. You can add new payment methods in project settings.`
} and failed. Please make sure your payment method is upto date and has sufficient balance. You can add new payment methods in Project Settings.`
);
logger.error(err);
throw err;

2
CommonUI/src/Components/CustomFields/CustomFieldsDetail.tsx
View File

@ -115,7 +115,7 @@ const CustomFieldsDetail: FunctionComponent<ComponentProps> = (
<div className="border-t border-gray-200 px-4 py-5 sm:px-6 -m-6 -mt-2">
{isLoading && !error && <ComponentLoader />}
{!isLoading && !error && schemaList.length === 0 && (
<ErrorMessage error="No custom fields are added for this resource. Please add customm fields for this resource in project settings." />
<ErrorMessage error="No custom fields have been added for this resource. You may add custom fields in Project Settings." />
)}
{error && <ErrorMessage error={error} />}
{!model && <ErrorMessage error={'Item not found'} />}

25
Dashboard/public/index.html
View File

@ -4,24 +4,21 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta charSet='utf-8' />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<meta name="slack-app-id" content="ACVBMTPJQ">
<meta name="description" content="This is the login page for OneUptime Dashboard">
<meta name="description" content="OneUptime — the complete open-source observability platform.">
<!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-PKQD5WH');</script>
<!-- End Google Tag Manager -->
<!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-PKQD5WH');
</script>
<!-- End Google Tag Manager -->
<link rel="manifest" href="/dashboard/assets/img/favicons/ma">
<link rel="apple-touch-icon" sizes="180x180" href="/dashboard/assets/img/favicons/apple-touch-icon.png">
@ -35,8 +32,8 @@
<meta name="msapplication-TileImage" content="/dashboard/assets/img/favicons/mstile-144x144.png">
<meta name="theme-color" content="#121212">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
<style>
* {
font-family: Inter;

2
Dashboard/src/Pages/Settings/APIKeys.tsx
View File

@ -56,7 +56,7 @@ const APIKeys: FunctionComponent<PageComponentProps> = (
icon: IconProp.Terminal,
title: 'API Keys',
description:
'All you can do on the dashboard can be done via the API. Use OneUptime API to automated repetitive work or integrate with other platforms you have.',
'Everything you can do on the dashboard can also be done via the OneUptime API- use it to automate repetitive work or integrate with other platforms.',
}}
noItemsMessage={'No API Keys found.'}
formFields={[

2
Docs/architecture.md
View File

@ -83,7 +83,7 @@ In this case, the user will need to install the server monitor agent in the targ
For every component, the user can define the different criteria that allow the backend to decide whether this component is working properly, degraded, or down.
In addition to the name, type, and criteria, the user can choose the category to which the resource should belong. The categories can be managed through the same dashboard under project settings.
In addition to the name, type, and criteria, the user can choose the category to which the resource should belong. The categories can be managed through the same dashboard under Project Settings.
#### Status pages

4
Notification/Services/CallService.ts
View File

@ -85,7 +85,7 @@ export default class CallService {
if (!project.enableCallNotifications) {
callLog.status = CallStatus.Error;
callLog.statusMessage = `Call notifications are not enabled for this project. Please enable Call notifications in project settings.`;
callLog.statusMessage = `Call notifications are not enabled for this project. Please enable Call notifications in Project Settings.`;
await CallLogService.create({
data: callLog,
@ -109,7 +109,7 @@ export default class CallService {
project.id!,
'Call notifications not enabled for ' +
(project.name || ''),
`We tried to make a call to ${callRequest.to.toString()}. <br/> <br/> This Call was not sent because call notifications are not enabled for this project. Please enable call notifications in project settings.`
`We tried to make a call to ${callRequest.to.toString()}. <br/> <br/> This Call was not sent because call notifications are not enabled for this project. Please enable call notifications in Project Settings.`
);
}
return;

4
Notification/Services/SmsService.ts
View File

@ -82,7 +82,7 @@ export default class SmsService {
if (!project.enableSmsNotifications) {
smsLog.status = SmsStatus.Error;
smsLog.statusMessage = `SMS notifications are not enabled for this project. Please enable SMS notifications in project settings.`;
smsLog.statusMessage = `SMS notifications are not enabled for this project. Please enable SMS notifications in Project Settings.`;
await SmsLogService.create({
data: smsLog,
@ -105,7 +105,7 @@ export default class SmsService {
project.id!,
'SMS notifications not enabled for ' +
(project.name || ''),
`We tried to send an SMS to ${to.toString()} with message: <br/> <br/> ${message} <br/> <br/> This SMS was not sent because SMS notifications are not enabled for this project. Please enable SMS notifications in project settings.`
`We tried to send an SMS to ${to.toString()} with message: <br/> <br/> ${message} <br/> <br/> This SMS was not sent because SMS notifications are not enabled for this project. Please enable SMS notifications in Project Settings.`
);
}
return;

10
StatusPage/public/index.html
View File

@ -4,20 +4,16 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta charSet='utf-8' />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<meta name="slack-app-id" content="ACVBMTPJQ">
<meta name="description" content="This is the login page for OneUptime Dashboard">
<meta name="description" content="OneUptime — the complete open-source observability platform.">
<script src="/status-page/env.js"></script>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
<style>
* {
font-family: Inter;