Merge branch 'dev' of https://github.com/umami-software/umami into dev

# Conflicts:
#	src/lib/redis.ts

Author: mikecao

package.json

@@ -67,7 +67,6 @@
     "@svgr/cli": "^8.1.0",
     "@tanstack/react-query": "^5.90.21",
     "@umami/react-zen": "^0.245.0",
-    "@umami/redis-client": "^0.30.0",
     "bcryptjs": "^3.0.2",
     "chalk": "^5.6.2",
     "chart.js": "^4.5.1",
@@ -110,6 +109,7 @@
     "react-simple-maps": "^2.3.0",
     "react-use-measure": "^2.0.4",
     "react-window": "^1.8.6",
+    "redis": "^4.5.1",
     "request-ip": "^3.3.0",
     "semver": "^7.7.4",
     "serialize-error": "^12.0.0",

pnpm-lock.yaml

@@ -51,6 +51,8 @@
     "confirm": "تأكيد",
     "confirm-password": "تأكيد كلمة المرور",
     "contains": "يحتوي على",
+    "regex-match": "يطابق التعبير النمطي",
+    "regex-not-match": "لا يطابق التعبير النمطي",
     "content": "المحتوى",
     "continue": "تابع",
     "conversion": "تحويل",
@@ -169,6 +171,9 @@
     "manager": "مدير",
     "max": "الحد الأقصى",
     "maximize": "توسيع",
+    "match": "تطابق",
+    "match-all": "الكل",
+    "match-any": "أي",
     "medium": "وسيط",
     "member": "عضو",
     "members": "الأعضاء",

public/intl/messages/ar-SA.json

@@ -51,6 +51,8 @@
     "confirm": "Падцвердзіць",
     "confirm-password": "Падцвердзіць пароль",
     "contains": "Уключае",
+    "regex-match": "Адпавядае рэгулярнаму выразу",
+    "regex-not-match": "Не адпавядае рэгулярнаму выразу",
     "content": "Змест",
     "continue": "Працягнуць",
     "conversion": "Канверсія",
@@ -169,6 +171,9 @@
     "manager": "Кіраўнік",
     "max": "Максімум",
     "maximize": "Разгарнуць",
+    "match": "Адпаведнасць",
+    "match-all": "Усе",
+    "match-any": "Любы",
     "medium": "Сярэдні",
     "member": "Удзельнік",
     "members": "Удзельнікі",

public/intl/messages/be-BY.json

@@ -51,6 +51,8 @@
     "confirm": "Потвърди",
     "confirm-password": "Потвърди парола",
     "contains": "Съдържа",
+    "regex-match": "Съвпада с регулярен израз",
+    "regex-not-match": "Не съвпада с регулярен израз",
     "content": "Съдържание",
     "continue": "Продължи",
     "conversion": "Конверсия",
@@ -169,6 +171,9 @@
     "manager": "Мениджър",
     "max": "Максимум",
     "maximize": "Разшири",
+    "match": "Съвпадение",
+    "match-all": "Всички",
+    "match-any": "Някои",
     "medium": "Среден",
     "member": "Член",
     "members": "Членове",

public/intl/messages/bg-BG.json

@@ -51,6 +51,8 @@
     "confirm": "নিশ্চিত করুন",
     "confirm-password": "পাসওয়ার্ড নিশ্চিত করুন",
     "contains": "রয়েছে",
+    "regex-match": "রেজেক্সের সাথে মেলে",
+    "regex-not-match": "রেজেক্সের সাথে মেলে না",
     "content": "বিষয়বস্তু",
     "continue": "পরবর্তিতে",
     "conversion": "রূপান্তর",
@@ -169,6 +171,9 @@
     "manager": "পরিচালক",
     "max": "সর্বাধিক",
     "maximize": "বিস্তৃত করুন",
+    "match": "মিলান",
+    "match-all": "সব",
+    "match-any": "যেকোনো",
     "medium": "মাঝারি",
     "member": "সদস্য",
     "members": "সদস্যগণ",

public/intl/messages/bn-BD.json

@@ -51,6 +51,8 @@
     "confirm": "Potvrdi",
     "confirm-password": "Potvrdi šifru",
     "contains": "Sadrži",
+    "regex-match": "Odgovara regularnom izrazu",
+    "regex-not-match": "Ne odgovara regularnom izrazu",
     "content": "Sadržaj",
     "continue": "Nastavi",
     "conversion": "Konverzija",
@@ -169,6 +171,9 @@
     "manager": "Menadžer",
     "max": "Maks",
     "maximize": "Proširi",
+    "match": "Podudaranje",
+    "match-all": "Sve",
+    "match-any": "Bilo koje",
     "medium": "Srednje",
     "member": "Član",
     "members": "Članovi",

public/intl/messages/bs-BA.json

@@ -51,6 +51,8 @@
     "confirm": "Confirmar",
     "confirm-password": "Confirma la contrasenya",
     "contains": "Conté",
+    "regex-match": "Coincideix amb l'expressió regular",
+    "regex-not-match": "No coincideix amb l'expressió regular",
     "content": "Contingut",
     "continue": "Continuar",
     "conversion": "Conversió",
@@ -169,6 +171,9 @@
     "manager": "Responsable",
     "max": "Màx",
     "maximize": "Expandeix",
+    "match": "Coincidència",
+    "match-all": "Tots",
+    "match-any": "Qualsevol",
     "medium": "Mitjà",
     "member": "Membre",
     "members": "Membres",

public/intl/messages/ca-ES.json

@@ -51,6 +51,8 @@
     "confirm": "Potvrdit",
     "confirm-password": "Potvrdit heslo",
     "contains": "Obsahuje",
+    "regex-match": "Odpovídá regulárnímu výrazu",
+    "regex-not-match": "Neodpovídá regulárnímu výrazu",
     "content": "Obsah",
     "continue": "Pokračovat",
     "conversion": "Konverze",
@@ -169,6 +171,9 @@
     "manager": "Správce",
     "max": "Max",
     "maximize": "Rozbalit",
+    "match": "Shoda",
+    "match-all": "Vše",
+    "match-any": "Jakýkoli",
     "medium": "Střední",
     "member": "Člen",
     "members": "Členové",

public/intl/messages/cs-CZ.json

@@ -51,6 +51,8 @@
     "confirm": "Bekræft",
     "confirm-password": "Godkendt adgangskode",
     "contains": "Indeholder",
+    "regex-match": "Matcher regulært udtryk",
+    "regex-not-match": "Matcher ikke regulært udtryk",
     "content": "Indhold",
     "continue": "Fortsæt",
     "conversion": "Konvertering",
@@ -169,6 +171,9 @@
     "manager": "Leder",
     "max": "Maks",
     "maximize": "Udvid",
+    "match": "Match",
+    "match-all": "Alle",
+    "match-any": "Enhver",
     "medium": "Medie",
     "member": "Medlem",
     "members": "Medlemmer",