Skip to content

Commit

Permalink
Merge branch 'develop' into bug/upgrade_jest_@types/jest
Browse files Browse the repository at this point in the history
  • Loading branch information
varshith257 authored Nov 2, 2024
2 parents 6095266 + 7501e34 commit 5a9d576
Show file tree
Hide file tree
Showing 53 changed files with 4,294 additions and 1,438 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ updates:
directory: "/"
# Schedule automated updates to run weekly
schedule:
interval: "weekly"
interval: "monthly"
# Labels to apply to Dependabot PRs
labels:
- "dependencies"
# Specify the target branch for PRs
target-branch: "develop"
# Customize commit message prefix
commit-message:
prefix: "chore(deps):"
prefix: "chore(deps):"
15 changes: 12 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ jobs:
echo "Error: Source and Target Branches are the same. Please ensure they are different."
exit 1
Check-Unauthorized-Changes:
if: ${{ github.actor != 'dependabot[bot]' }}
name: Checks if no unauthorized files are changed
Check-Sensitive-Files:
if: ${{ github.actor != 'dependabot[bot]' && !contains(github.event.pull_request.labels.*.name, 'ignore-sensitive-files-pr') }}
name: Checks if sensitive files have been changed without authorization
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -97,6 +97,7 @@ jobs:
.node-version
.husky/**
scripts/**
schema.graphql
package.json
tsconfig.json
.gitignore
Expand All @@ -111,6 +112,14 @@ jobs:
LICENSE
setup.ts
.coderabbit.yaml
CODE_OF_CONDUCT.md
CODE_STYLE.md
CONTRIBUTING.md
DOCUMENTATION.md
INSTALLATION.md
ISSUE_GUIDELINES.md
PR_GUIDELINES.md
README.md
- name: List all changed unauthorized files
if: steps.changed-unauth-files.outputs.any_changed == 'true' || steps.changed-unauth-files.outputs.any_deleted == 'true'
Expand Down
126 changes: 63 additions & 63 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@mui/private-theming": "^5.15.12",
"@mui/system": "^5.14.12",
"@mui/x-charts": "^7.17.0",
"@mui/x-data-grid": "^7.16.0",
"@mui/x-data-grid": "^7.22.0",
"@mui/x-date-pickers": "^7.11.1",
"@pdfme/generator": "^4.5.2",
"@reduxjs/toolkit": "^2.3.0",
Expand All @@ -38,7 +38,7 @@
"inquirer": "^8.0.0",
"js-cookie": "^3.0.1",
"markdown-toc": "^1.2.0",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"react": "^18.3.1",
"react-beautiful-dnd": "^13.1.1",
"react-bootstrap": "^2.10.5",
Expand All @@ -56,13 +56,13 @@
"redux": "^5.0.1",
"redux-thunk": "^3.1.0",
"sanitize-html": "^2.13.0",
"typedoc": "^0.26.7",
"typedoc": "^0.26.10",
"typedoc-plugin-markdown": "^4.2.1",
"typescript": "^5.6.3",
"vite": "^5.4.8",
"vite-plugin-environment": "^1.1.3",
"vite-tsconfig-paths": "^5.0.1",
"web-vitals": "^4.2.3"
"web-vitals": "^4.2.4"
},
"scripts": {
"serve": "cross-env ESLINT_NO_DEV_ERRORS=true vite --config config/vite.config.ts",
Expand Down Expand Up @@ -122,7 +122,7 @@
"@types/react-google-recaptcha": "^2.1.9",
"@types/react-router-dom": "^5.1.8",
"@types/sanitize-html": "^2.13.0",
"@typescript-eslint/eslint-plugin": "^8.8.1",
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.5.0",
"babel-jest": "^29.7.0",
"cross-env": "^7.0.3",
Expand Down
29 changes: 28 additions & 1 deletion public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,34 @@
"successfullyUnassigned": "Tag unassigned from user",
"addPeople": "Add People",
"add": "Add",
"subTags": "Sub Tags"
"subTags": "Sub Tags",
"assignedToAll": "Tag Assigned to All",
"successfullyAssignedToPeople": "Tag assigned successfully",
"errorOccurredWhileLoadingMembers": "Error occured while loading members",
"userName": "User Name",
"actions": "Actions",
"noOneSelected": "No One Selected",
"assignToTags": "Assign to Tags",
"removeFromTags": "Remove from Tags",
"assign": "Assign",
"remove": "Remove",
"successfullyAssignedToTags": "Successfully Assigned to Tags",
"successfullyRemovedFromTags": "Successfully Removed from Tags",
"errorOccurredWhileLoadingOrganizationUserTags": "Error occurred while loading organization tags",
"errorOccurredWhileLoadingSubTags": "Error occurred while loading subTags tags",
"removeUserTag": "Delete Tag",
"removeUserTagMessage": "Do you want to delete this tag? It delete all the sub tags and all the associations.",
"tagDetails": "Tag Details",
"tagName": "Name",
"tagUpdationSuccess": "Tag updated successfully",
"tagRemovalSuccess": "Tag deleted successfully",
"noTagSelected": "No Tag Selected",
"changeNameToEdit": "Change the name to make an update",
"selectTag": "Select Tag",
"collapse": "Collapse",
"expand": "Expand",
"tagNamePlaceholder": "Write the name of the tag",
"allTags": "All Tags"
},
"userListCard": {
"addAdmin": "Add Admin",
Expand Down
Loading

0 comments on commit 5a9d576

Please sign in to comment.