Skip to content

Commit c3004d6

Browse files
authored
Merge branch 'master' into bug-repetation
2 parents 18699bf + b1d6f86 commit c3004d6

File tree

7 files changed

+9
-20
lines changed

7 files changed

+9
-20
lines changed

examples/next-12/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 1 addition & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
"billboard.js": "^3.14.3",
105105
"js-yaml": "^4.1.0",
106106
"lodash": "^4.17.21",
107-
"moment-timezone": "^0.5.47",
107+
"moment": "^2.30.1",
108108
"mui-datatables": "*",
109109
"re-resizable": "^6.10.3",
110110
"react-draggable": "^4.4.6",

src/custom/DashboardWidgets/WorkspaceActivityWidget.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { SelectChangeEvent } from '@mui/material';
22
import { styled } from '@mui/material/styles';
3-
import moment from 'moment-timezone';
3+
import moment from 'moment';
44
import {
55
Box,
66
Button,

src/custom/ResourceDetailFormatters/useResourceCleanData.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
22
import _ from 'lodash';
3-
import moment from 'moment-timezone';
3+
import moment from 'moment';
44
import { GetResourceCleanDataProps, NumberState } from './types';
55

66
export const useResourceCleanData = () => {

src/schemas/createAndEditEnvironment/schema.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const createAndEditEnvironmentSchema = {
22
title: 'Environment',
3+
required: ['name'],
34
properties: {
45
description: {
56
description:

src/utils/time.utils.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import moment from 'moment-timezone';
1+
import moment from 'moment';
22
import { CustomTooltip } from '../custom';
33

44
export const getRelativeTime = (date: string): string => {

0 commit comments

Comments
 (0)