Skip to content

Commit 326db94

Browse files
authored
Merge pull request #667 from KelvinTegelaar/dev
[pull] dev from KelvinTegelaar:dev
2 parents 877dc1c + bed7d47 commit 326db94

File tree

6 files changed

+12
-8
lines changed

6 files changed

+12
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cipp",
3-
"version": "8.7.1",
3+
"version": "8.8.0",
44
"author": "CIPP Contributors",
55
"homepage": "https://cipp.app/",
66
"bugs": {

public/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "8.7.2"
2+
"version": "8.8.0"
33
}

public/version_latest.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/components/CippComponents/CippAddDomainDrawer.jsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import React, { useState, useEffect } from "react";
2-
import { Button, Box } from "@mui/material";
1+
import { useState, useEffect } from "react";
2+
import { Button, Box, Alert } from "@mui/material";
33
import { useForm, useFormState } from "react-hook-form";
44
import { AddCircleOutline } from "@mui/icons-material";
55
import { CippOffCanvas } from "./CippOffCanvas";
@@ -102,14 +102,19 @@ export const CippAddDomainDrawer = ({
102102
</Stack>
103103
}
104104
>
105-
<Box sx={{ my: 2 }}>
105+
<Stack spacing={2}>
106+
<Alert severity="info">
107+
Add a new domain to the current tenant. Ensure that the appropriate DNS records are
108+
configured by checking the verification and service records after adding the domain. You
109+
can find these in the "More info" section once the domain is added.
110+
</Alert>
106111
<CippFormComponent
107112
formControl={formControl}
108113
fields={formFields}
109114
name="domain"
110115
label="Domain Name"
111116
/>
112-
</Box>
117+
</Stack>
113118
</CippOffCanvas>
114119
</>
115120
);

src/pages/tenant/administration/domains/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ const Page = () => {
9999
data: { domain: "id", Action: "setDefault" },
100100
confirmText: "Are you sure you want to set [id] as the default domain?",
101101
multiPost: false,
102+
hideBulk: true,
102103
},
103104
{
104105
label: "Delete Domain",

version_latest.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)