Skip to content

Commit 20aa00f

Browse files
pavanputtipavanputti
committed
Merge remote-tracking branch 'origin/development' into Siva_fix_member_column_filter
# Conflicts: # package-lock.json # yarn.lock
2 parents c907268 + 6ffad10 commit 20aa00f

419 files changed

Lines changed: 42701 additions & 39070 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.

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ yarn-error.log*
2828
/.idea
2929

3030
.vscode/launch.json
31+
.vscode/settings.json
3132

3233
**\ **
3334

34-
/public/tinymce/
35+
/public/tinymce/
36+
package-lock.json

‎.husky/pre-commit‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ if [ -f .nvmrc ]; then
77
nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
88
fi
99

10-
. "$(dirname "$0")/_/husky.sh"
11-
1210
echo ""
1311
echo "🛡️ Husky pre-commit hook triggered"
1412

‎.prettierignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
*.png
22
*.svg
33
src/actions/**
4-
src/App.css
54
src/config.json
65

76
src/languages/**

‎.stylelintrc‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
1-
{
2-
"ignoreFiles": [
3-
"build/**/*.css",
4-
"public/**/*.css",
5-
"node_modules/**/*.css"
6-
],
7-
"rules": {
8-
"no-duplicate-selectors": true
9-
}
10-
}
1+
{
2+
"extends": ["stylelint-config-standard"],
3+
"ignoreFiles": [
4+
"build/**/*.css",
5+
"public/**/*.css",
6+
"node_modules/**/*.css"
7+
],
8+
"rules": {
9+
"no-duplicate-selectors": true,
10+
"selector-pseudo-class-no-unknown": [
11+
true,
12+
{ "ignorePseudoClasses": ["global", "local"] }
13+
],
14+
"selector-class-pattern": null,
15+
"selector-id-pattern": null
16+
}
17+
}

‎index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<base href="/" />
45
<meta charset="utf-8" />
56
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
67
<meta name="theme-color" content="#000000" />

0 commit comments

Comments
 (0)