Merge branch 'dev' into auto-merge/rel-7-4/2217

abpframework · Oct 2, 2023 · 8b4a522 · 8b4a522
2 parents e9b914c + 3bdd228
commit 8b4a522
Show file tree

Hide file tree

Showing 626 changed files with 6,466 additions and 2,055 deletions.
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.yml b/.github/ISSUE_TEMPLATE/02_feature_request.yml
@@ -1,6 +1,6 @@
 name: 💡 Feature request
 description: Suggest an idea for this project
-labels: [feature]
+labels: [feature-request]
 body:
 - type: checkboxes
   attributes:

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,14 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 7.x.x   | :white_check_mark: |
+| < 7.0.0 | :x:                |
+
+## Reporting a Vulnerability
+
+Please don not share vulnerabilities publicly in GitHub or other platforms.
+You can report security issues by sending a email to `[email protected]`
+Your report is immediately evaluated. We publish patch versions for critical vulnerabilities in a week at most.
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Admin/Localization/Resources/en.json
@@ -493,6 +493,46 @@
     "QuotationTemplate.Tax/VAT:": "Tax / Vat (%{0}) :",
     "QuotationTemplate.TotalDiscount:": "Total Discount :",
     "QuotationTemplate.TOTALDUE:": "TOTAL DUE :", 
-    "QuotationTemplate.BankAccount": "Our bank account information can be found at {0}"
+    "QuotationTemplate.BankAccount": "Our bank account information can be found at {0}",
+    "Permission:Raffles": "Raffle",
+    "Permission:Draw": "Draw",
+    "Menu:Raffles": "Raffles",
+    "RaffleIsNotDrawable": "Raffle is not drawable",
+    "WinnerCountMustBeGreaterThanZero": "Winner count must be greater than zero",
+    "FullDescription": "Full Description",
+    "VisibilityStartDate": "Visibility Start Date",
+    "VisibilityEndDate": "Visibility End Date",
+    "RaffleDate": "Raffle Date",
+    "SubscriptionCode": "Subscription Code",
+    "GroupCode": "Group Code",
+    "MaxWinnerCount": "Max Winner Count",
+    "ReDraw": "Re-Draw",
+    "EditRaffle": "Edit Raffle",
+    "Raffles": "Raffles",
+    "CreateARaffle": "Create a raffle",
+    "Draw": "Draw",
+    "Enum:RaffleStatus:0": "Active",
+    "Enum:RaffleStatus:1": "Next",
+    "Enum:RaffleStatus:2": "Past",
+    "DrawDone": "Draw Done",
+    "HomePageShowType": "Home Page Show Type",
+    "None": "None",
+    "Card": "Card",
+    "Horizontal": "Horizontal",
+    "Winners": "Winners",
+    "StartDateMustBeLessThanEndDate": "Start date must be less than end date",
+    "VisibilityStartDateMustBeLessThanVisibilityEndDate": "Visibility start date must be less than visibility end date",
+    "StartDateMustBeGreaterThanVisibilityStartDate": "Start date must be greater than visibility start date",
+    "EndDateMustBeLessThanVisibilityEndDate": "End date must be less than visibility end date",
+    "DrawnDone": "Drawn Done",
+    "AddColor": "Add Color",
+    "Colors": "Colors",
+    "RemoveColor": "Remove Color",
+    "MaxColorCountWarning": "You can add up to {0} colors",
+    "MinColorCountWarning": "You must add at least {0} colors",
+    "RaffleDeletionConfirmationMessage": "Are you sure you want to delete this raffle?",
+    "CreateRaffle": "Create Raffle",
+    "RemoveImage": "Remove Image",
+    "SuccessfullySaved": "Successfully saved"
   }
 }
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/ar.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/ar.json
@@ -167,7 +167,7 @@
     "ABPDiscordServer": "ABP سيرفر الدسكورد",
     "ABPCommunityTalks": "برامج منتدى ABP الحوارية",
     "ABPCommunityPosts": "منشورات منتدى ABP",
-    "BuyAndGetMonths": "شراء 12 شهر، <span class=\"text-info\">احصل على 14 شهرا!</span>",
+    "BuyAndGetMonths": "شراء 12 شهر، <span>احصل على 14 شهرا!</span>",
     "GetYourDeal": "احصل على صفقتك",
     "BuyOrRenewLicense": "اشترِ أو جدد الرخصة الآن واحصل على شهرين إضافيين!",
     "BuyOrRenewLicenseToGetExtra2Months": "اشترِ أو جدد الرخصة الآن واحصل على شهرين إضافيين! اسرع! ⏰ آخر يوم: {0}",

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/en.json
@@ -171,7 +171,7 @@
     "ABPDiscordServer": "ABP Discord Server",
     "ABPCommunityTalks": "ABP Community Talks",
     "ABPCommunityPosts": "ABP Community Posts",
-    "BuyAndGetMonths": "BUY 12 MONTHS, <span class=\"text-info\">GET 14 MONTHS!</span>",
+    "BuyAndGetMonths": "BUY 12 MONTHS, <span>GET 14 MONTHS!</span>",
     "GetYourDeal": "Get Your Deal",
     "BuyOrRenewLicense": "Buy or Renew License Now and Get 2 Extra Months!",
     "BuyOrRenewLicenseToGetExtra2Months": "Buy or Renew License Now and Get 2 Extra Months! HURRY UP! ⏰ Last Day: {0}",
@@ -187,7 +187,7 @@
     "GiveAwayForNewPurchases": "Application Development Classroom Training will be given away for the new purchases!",
     "BlackFriday": "<strong>BLACK</strong> <span>FRIDAY</span>",
     "ValidForExistingCustomers": "Also valid for the <br> existing customers!",
-    "CampaignBetweenDates": "From {0} <br>to {1}",
+    "CampaignBetweenDates": "From {0} <br>To {1}",
     "SaveUpTo": "<span>SAVE</span> UP TO<strong>${0}K</strong>",
     "ImplementingDDD": "Implementing Domain Driven Design",
     "ExploreTheEBook": "Explore the E-Book",
@@ -220,6 +220,7 @@
     "NoContent": "No content",
     "More": "More",
     "WhyABPIOPlatform": "Why ABP.IO Platform?",
-    "AbpStudio": "ABP Studio"
+    "AbpStudio": "ABP Studio",
+    "ExtraMonths": "{0}<span>EXTRA MONTHS</span>"
   }
 }
diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/fi.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/fi.json
@@ -170,7 +170,7 @@
     "ABPDiscordServer": "ABP Discord-palvelin",
     "ABPCommunityTalks": "ABP Community Talks",
     "ABPCommunityPosts": "ABP-yhteisön viestit",
-    "BuyAndGetMonths": "OSTA 12 KUUKAUTA, <span class=\"text-info\">SAAT 14 KUUKAUTA!</span>",
+    "BuyAndGetMonths": "OSTA 12 KUUKAUTA, <span>SAAT 14 KUUKAUTA!</span>",
     "GetYourDeal": "Hanki tarjouksesi",
     "BuyOrRenewLicense": "Osta tai uusi lisenssi nyt ja saat 2 lisäkuukautta!",
     "BuyOrRenewLicenseToGetExtra2Months": "Osta tai uusi lisenssi nyt ja saat 2 lisäkuukautta! KIIREHDI! ⏰ Viimeinen päivä: {0}",

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/hu.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/hu.json
@@ -168,7 +168,7 @@
     "ABPDiscordServer": "ABP Discord szerver",
     "ABPCommunityTalks": "ABP közösségi beszélgetések",
     "ABPCommunityPosts": "ABP közösségi bejegyzések",
-    "BuyAndGetMonths": "VÁSÁROLJON 12 HÓNAPOT, <span class=\"text-info\">14 HÓNAPOT KAP!</span>",
+    "BuyAndGetMonths": "VÁSÁROLJON 12 HÓNAPOT, <span>14 HÓNAPOT KAP!</span>",
     "GetYourDeal": "Szerezze meg az ajánlatát",
     "BuyOrRenewLicense": "Vásároljon vagy újítson meg licencet most, és 2 további hónapot kap!",
     "BuyOrRenewLicenseToGetExtra2Months": "Vásároljon vagy újítson meg licencet most, és 2 további hónapot kap! SIESS! ⏰ Utolsó nap: {0}",

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/zh-Hans.json
@@ -170,7 +170,7 @@
     "ABPDiscordServer": "ABP Discord 服务器",
     "ABPCommunityTalks": "ABP社区讲话",
     "ABPCommunityPosts": "ABP社区文章",
-    "BuyAndGetMonths": "购买 12 个月，<span class=\"text-info\">获得 14 个月!</span>",
+    "BuyAndGetMonths": "购买 12 个月，<span>获得 14 个月!</span>",
     "GetYourDeal": "得到你的交易",
     "BuyOrRenewLicense": "立即购买或续订许可证并额外获得 2 个月！",
     "BuyOrRenewLicenseToGetExtra2Months": "立即购买或续订 ABP 商业许可证（适用于所有版本）并额外获得 2 个月！",

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ar.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/ar.json
@@ -46,6 +46,8 @@
     "IndexPageHeroSection": "<span class=\"first-line\"> نظام أساسي كامل لتطوير الويب </ span> <span class=\"second-line\"> </ span> <span class=\"third-line\"> مدمج <img src=\"{0}\" width = \"110\" class=\"ml-1\" /> framework </span>",
     "AbpCommercialShortDescription": "يوفر ABP Commercial وحدات تطبيق مسبقة الإنشاء وأدوات تطوير سريعة للتطبيقات وموضوعات واجهة مستخدم احترافية ودعمًا متميزًا والمزيد.",
     "LiveDemo": "عرض حي",
+    "LiveDemoLead": "<a href=\"{0}\">{1}</a> باستخدام حساب ABP الخاص بك، <a href=\"{2}\">{3}</a>إلى abp.io.<br/>أو املأ النموذج أدناه لإنشاء عرض توضيحي مباشر الآن",
+    "ThereIsAlreadyAnAccountWithTheGivenEmailAddress": "هناك حساب بالفعل باستخدام عنوان البريد الإلكتروني المحدد: <b>{0}</b><br/> يمكنك تسجيل الدخول باستخدام حسابك للمتابعة.",
     "GetLicence": "احصل على ترخيص",
     "Application": "تطبيق",
     "StartupTemplates": "قوالب بدء تشغيل ABP",
@@ -129,12 +131,14 @@
     "YourFullName": "اسمك الكامل",
     "EmailField": "عنوان البريد الإلكتروني",
     "YourEmailAddress": "عنوان بريدك الإلكتروني",
+    "ValidEmailAddressIsRequired": "مطلوب عنوان بريد إلكتروني صالح.",
     "HowMayWeHelpYou": "كيف يمكن أن نساعدك؟",
     "SendMessage": "أرسل رسالة",
     "Success": "النجاح",
     "WeWillReplyYou": "لقد تلقينا رسالتك وسنتواصل معك قريبًا.",
     "GoHome": "اذهب للمنزل",
     "CreateLiveDemo": "إنشاء عرض حي",
+    "CreateLiveDemoDescription": "بمجرد إرسال هذا النموذج ، ستتلقى رسالة بريد إلكتروني تحتوي على رابط العرض التوضيحي الخاص بك.",
     "RegisterToTheNewsletter": "سجل في النشرة الإخبارية لتلقي معلومات بخصوص ABP.IO ، بما في ذلك الإصدارات الجديدة وما إلى ذلك.",
     "EnterYourEmailOrLogin": "أدخل عنوان بريدك الإلكتروني لإنشاء العرض التوضيحي أو <a href=\"{0}\"> تسجيل الدخول </a> باستخدام حسابك الحالي.",
     "ApplicationTemplate": "نموذج التطبيق",

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/cs.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/cs.json
@@ -46,6 +46,8 @@
     "IndexPageHeroSection": "<span class=\"first-line\">Kompletní</span><span class=\"second-line\"> platforma pro vývoj webu</span><span class=\"third-line\">vestavěná na <img src= \"{0}\" width=\"110\" class=\"ml-1\" /> framework</span>",
     "AbpCommercialShortDescription": "ABP Commercial poskytuje předpřipravené aplikační moduly, nástroje pro rychlý vývoj aplikací, profesionální témata uživatelského rozhraní, prémiovou podporu a další.",
     "LiveDemo": "Živá ukázka",
+    "LiveDemoLead": "<a href=\"{0}\">{1}</a> pomocí vašeho účtu ABP,  <a href=\"{2}\">{3}</a> na abp.io.<br/>Nebo vyplňte níže uvedený formulář a vytvořte si nyní živou ukázku",
+    "ThereIsAlreadyAnAccountWithTheGivenEmailAddress": "Zadaná e-mailová adresa <b>{0}</b> je již registrována.<br/> Můžete se přihlásit se svým účtem a pokračovat.",
     "GetLicence": "Získejte licenci",
     "Application": "aplikace",
     "StartupTemplates": "Spouštěcí šablony",
@@ -129,12 +131,14 @@
     "YourFullName": "Vaše celé jméno",
     "EmailField": "Emailová adresa",
     "YourEmailAddress": "Vaše emailová adresa",
+    "ValidEmailAddressIsRequired": "Je vyžadována platná e-mailová adresa.",
     "HowMayWeHelpYou": "Jak vám můžeme pomoci?",
     "SendMessage": "Poslat zprávu",
     "Success": "Úspěch",
     "WeWillReplyYou": "Obdrželi jsme vaši zprávu a brzy se vám ozveme.",
     "GoHome": "Jdi domů",
     "CreateLiveDemo": "Vytvořit živé demo",
+    "CreateLiveDemoDescription": "Po odeslání tohoto formuláře obdržíte e-mail obsahující odkaz na vaši ukázku.",
     "RegisterToTheNewsletter": "Zaregistrujte se k odběru newsletteru a získejte informace o ABP.IO, včetně nových verzí atd.",
     "EnterYourEmailOrLogin": "Chcete-li vytvořit ukázku, zadejte svou e-mailovou adresu nebo se <a href=\"{0}\">přihlaste</a> pomocí svého stávajícího účtu.",
     "ApplicationTemplate": "Šablona aplikace",

diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/de.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/de.json
@@ -46,6 +46,8 @@
     "IndexPageHeroSection": "<span class=\"first-line\">Eine komplette</span><span class=\"second-line\"> Webentwicklungsplattform</span><span class=\"third-line\">aufgebaute <img src= \"{0}\" width=\"110\" class=\"ml-1\" /> Framework</span>",
     "AbpCommercialShortDescription": "ABP Commercial bietet vorgefertigte Anwendungsmodule, schnelle Anwendungsentwicklungstools, professionelle UI-Themen, Premium-Support und mehr.",
     "LiveDemo": "Live-Demo",
+    "LiveDemoLead": "<a href=\"{0}\">{1}</a> mit Ihrem ABP-Konto, <a href=\"{2}\">{3}</a> zu abp.io.<br/>Oder füllen Sie das Formular unten aus, um jetzt eine Live-Demo zu erstellen",
+    "ThereIsAlreadyAnAccountWithTheGivenEmailAddress": "Es gibt bereits ein Konto mit der angegebenen E-Mail-Adresse: <b>{0}</b><br/> Sie können sich mit Ihrem Konto anmelden, um fortzufahren.",
     "GetLicence": "Holen Sie sich eine Lizenz",
     "Application": "Anwendung",
     "StartupTemplates": "Startup-Vorlagen",
@@ -129,12 +131,14 @@
     "YourFullName": "Ihren vollständigen Namen",
     "EmailField": "E-Mail-Addresse",
     "YourEmailAddress": "Ihre E-Mail-Adresse",
+    "ValidEmailAddressIsRequired": "Eine gültige E-Mail-Adresse ist erforderlich.",
     "HowMayWeHelpYou": "Wie können wir Ihnen helfen?",
     "SendMessage": "Nachricht senden",
     "Success": "Erfolg",
     "WeWillReplyYou": "Wir haben Ihre Nachricht erhalten und werden uns in Kürze bei Ihnen melden.",
     "GoHome": "Nach Hause gehen",
     "CreateLiveDemo": "Live-Demo erstellen",
+    "CreateLiveDemoDescription": "Sobald Sie dieses Formular absenden, erhalten Sie eine E-Mail mit Ihrem Demo-Link.",
     "RegisterToTheNewsletter": "Melden Sie sich für den Newsletter an, um Informationen zu ABP.IO, einschließlich Neuerscheinungen etc. zu erhalten.",
     "EnterYourEmailOrLogin": "Geben Sie Ihre E-Mail-Adresse ein, um Ihre Demo zu erstellen, oder <a href=\"{0}\">Login</a> mit Ihrem bestehenden Konto.",
     "ApplicationTemplate": "Bewerbungsvorlage",