Skip to content

Commit 348a710

Browse files
merge with dev
2 parents 6e0008e + a715a63 commit 348a710

166 files changed

Lines changed: 5153 additions & 3489 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

dummy.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// trigger reopen

eslint.config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@ module.exports = [
3333
'src/components/Reports/PeopleReport/components/PeopleTasksPieChart.test.jsx',
3434
// Ignore entire component folders
3535
'src/components/Badge/**',
36-
'src/components/Projects/**',
3736
'src/components/SummaryManagement/**',
3837
'src/components/TeamMemberTasks/**',
3938
'src/components/Teams/TeamMembersPopup.jsx',
40-
'src/components/UserManagement/**',
4139
'src/components/UserProfile/**',
4240
'src/components/Announcements/index.jsx',
4341
],

package-lock.json

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

package.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
"@emotion/react": "^11.8.1",
1515
"@emotion/styled": "^11.14.0",
1616
"@fortawesome/fontawesome-svg-core": "^6",
17+
"@fortawesome/free-brands-svg-icons": "^7.0.0",
1718
"@fortawesome/free-regular-svg-icons": "^6",
18-
"@fortawesome/free-solid-svg-icons": "^6",
19-
"@fortawesome/react-fontawesome": "^0.2",
19+
"@fortawesome/free-solid-svg-icons": "^6.7.2",
20+
"@fortawesome/react-fontawesome": "^0.2.3",
2021
"@hello-pangea/dnd": "^18.0.1",
2122
"@mui/lab": "^7.0.0-beta.12",
2223
"@mui/material": "^7.1.0",
@@ -29,15 +30,16 @@
2930
"ajv": "^8.0.0",
3031
"ajv-keywords": "^5.1.0",
3132
"assert": "^2.1.0",
32-
"axios": "^1.9.0",
33+
"axios": "^1.11.0",
3334
"axios-mock-adapter": "^1.22.0",
3435
"bootstrap": "^4.5.3",
3536
"braces": "^3.0.3",
3637
"buffer": "^6.0.3",
3738
"canvas-confetti": "^1.9.3",
38-
"chart.js": "^4.1.1",
39+
"chart.js": "^4.5.0",
3940
"chartjs-plugin-datalabels": "^2.2.0",
4041
"classnames": "^2.2.6",
42+
"clsx": "^2.1.1",
4143
"cross-spawn": "^7.0.6",
4244
"crypto-browserify": "^3.12.1",
4345
"d3": "^7.8.5",
@@ -72,7 +74,6 @@
7274
"rc-slider": "^11.1.8",
7375
"react": "^18.3.1",
7476
"react-autosuggest": "^10.1.0",
75-
"react-beautiful-dnd": "^13.1.1",
7677
"react-bootstrap": "^1.0.1",
7778
"react-chartjs-2": "^5.3.0",
7879
"react-circular-progressbar": "^2.1.0",
@@ -88,17 +89,17 @@
8889
"react-router": "^5.3.4",
8990
"react-router-dom": "^5.2.0",
9091
"react-router-hash-link": "^2.3.1",
91-
"react-select": "^5.10.1",
92+
"react-select": "^5.10.2",
9293
"react-spinners": "^0.15.0",
9394
"react-sticky": "^6.0.3",
9495
"react-table": "^7.8.0",
9596
"react-to-pdf": "^1.0.1",
9697
"react-to-print": "^3.0.5",
9798
"react-toastify": "^5.3.1",
98-
"react-tooltip": "^4.2.10",
99+
"react-tooltip": "^4.5.1",
99100
"react-use-websocket": "^3.0.0",
100101
"reactjs-popup": "^2.0.5",
101-
"reactstrap": "^8.4.1",
102+
"reactstrap": "^8.10.1",
102103
"read-excel-file": "^5.5.3",
103104
"recharts": "^2.1.9",
104105
"redux": "^4.0.5",
@@ -112,6 +113,10 @@
112113
"util": "^0.12.5",
113114
"uuid": "^9.0.1"
114115
},
116+
"resolutions": {
117+
"react": "18.3.1",
118+
"react-dom": "18.3.1"
119+
},
115120
"packageManager": "yarn@1.22.22",
116121
"scripts": {
117122
"prestart": "npm run test",
3.88 KB
Loading
2.82 KB
Loading
3.34 KB
Loading
3.19 KB
Loading
7.65 KB
Loading
11 KB
Loading

0 commit comments

Comments
 (0)