Merge branch 'dev' into geoip

This commit is contained in:
Owen
2025-08-25 21:07:17 -07:00
23 changed files with 265 additions and 35 deletions

View File

@@ -777,15 +777,6 @@ export default function Page() {
</SettingsContainer>
<div className="flex justify-end space-x-2 mt-8">
<Button
type="button"
variant="outline"
onClick={() => {
router.push(`/${orgId}/settings/access/users`);
}}
>
{t("cancel")}
</Button>
{userType && dataLoaded && (
<Button
type={inviteLink ? "button" : "submit"}

View File

@@ -51,7 +51,12 @@ function getActionsCategories(root: boolean) {
[t('actionSetResourcePassword')]: "setResourcePassword",
[t('actionSetResourcePincode')]: "setResourcePincode",
[t('actionSetResourceEmailWhitelist')]: "setResourceWhitelist",
[t('actionGetResourceEmailWhitelist')]: "getResourceWhitelist"
[t('actionGetResourceEmailWhitelist')]: "getResourceWhitelist",
[t('actionCreateSiteResource')]: "createSiteResource",
[t('actionDeleteSiteResource')]: "deleteSiteResource",
[t('actionGetSiteResource')]: "getSiteResource",
[t('actionListSiteResources')]: "listSiteResources",
[t('actionUpdateSiteResource')]: "updateSiteResource"
},
Target: {