chore: merged development for changes

Author: AnthonyWeathers

.gitignore

@@ -27,8 +27,9 @@ yarn-error.log*
 /.idea
 
 .vscode/launch.json
-.vscode/settings.json
 
 **\ **
 
-/public/tinymce/
+/public/tinymce/Community/
+Community/
+public/tinymce/

.husky/pre-push

@@ -25,6 +25,12 @@ if [ -z "$changed_files" ]; then
   exit 0
 fi
 
+# Skip checks if any outgoing commit is a merge commit
+if git log @{upstream}..HEAD --merges --oneline | grep -q .; then
+  echo "ℹ️  Outgoing commits include a merge commit. Skipping lint/test checks."
+  exit 0
+fi
+
 if ! printf '%s\n' "$changed_files" | grep -qvE '^\.husky/'; then
   echo "ℹ️  Only Husky hook changes detected. Skipping full test and lint checks."
   exit 0

.stylelintrc

@@ -6,12 +6,22 @@
     "node_modules/**/*.css"
   ],
   "rules": {
-    "no-duplicate-selectors": true,
+    "no-duplicate-selectors": [true, {
+      "disallowInList": false
+    }],
     "selector-pseudo-class-no-unknown": [
       true,
       { "ignorePseudoClasses": ["global", "local"] }
     ],
     "selector-class-pattern": null,
     "selector-id-pattern": null
-  }
-}
+  },
+  "overrides": [
+    {
+      "files": ["**/*.module.css"],
+      "rules": {
+        "no-duplicate-selectors": null
+      }
+    }
+  ]
+}