Merge branch 'dev' of https://github.com/abpframework/abp into feat/9783

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json

@@ -359,11 +359,24 @@
     "InvalidFormInputs": "Please, type the valid information specified on the form.",
     "DDDBookEmailBody": "Thank you. <br /> To download your book, <a href=\"{0}\">click here</a>.",
     "FreeDDDEBook": "Free DDD E-Book",
+    "StartFree": "Start free",
+    "FreeTrial": "Free Trial",
+    "AcceptsMarketingCommunications": " Yes, I`d like to receive ABP Commercial marketing communications.",
+    "PurposeOfUsage": "Purpose of usage",
+    "Industry": "Industry",
+    "Choose": "- Choose -",
+    "CompanyOrganizationName": "Company / Organization Name",
+    "CompanySize": "Company Size",
+    "Next": "Next",
+    "StartTrial": "Start My Free Trial",
+    "ContactUsIssues": "Contact us if you have any issues",
+    "TrialActivatedWarning": "Dear {0}, a user is entitled to have only 1 free trial period. You already used your trial period.",
+    "ActivationRequirement": "You are one step away from starting your free trial.<br>We have sent an email to <b>{0}</b> to activate your account. Check your inbox/junk/spam boxes!",
     "SaveAndDownload": "Save And Download",
-    "CompanyNameValidationMessage": "Company Name is too long.",
+    "CompanyNameValidationMessage": "Company name is too long!",
-    "AddressValidationMessage": "Address is too long.",
+    "AddressValidationMessage": "Address is too long!",
-    "TaxNoValidationMessage": "TAX/VAT No is too long.",
+    "TaxNoValidationMessage": "TAX/VAT No is too long!",
-    "NotesValidationMessage": "Too many characters.",
+    "NotesValidationMessage": "Notes field is too long!",
-    "CheckYourBillingInfo": "Check your billing info before creating your invoice. You can create your invoice only once!"
+    "CheckYourBillingInfo": "You can create your invoice only once! Check your billing info before creating your invoice."
   }
-}
+}

docs/en/Blog-Posts/2021-07-28-lepton-x-release/POST.md

@@ -37,7 +37,7 @@ with
 "node_modules/bootstrap-icons/font/bootstrap-icons.css",
 ```
 
-* Finally, remove `ThemeBasicModule` and import the related modules in `app.module.ts`
+* Finally, remove `ThemeBasicModule` from `app.module.ts` and `shared.module.ts`, and import the related modules in `app.module.ts`
 
 ```js
 import { ThemeLeptonXModule } from '@abp/ng.theme.lepton-x';
@@ -46,9 +46,6 @@ import { SideMenuLayoutModule } from '@abp/ng.theme.lepton-x/layouts';
 @NgModule({
   imports: [
     // ...
-
-    // do not forget to remove ThemeBasicModule
-    //  ThemeBasicModule.forRoot(),
     ThemeLeptonXModule.forRoot(),
     SideMenuLayoutModule.forRoot(),
   ],
@@ -144,7 +141,7 @@ The fourth one depends on which layout you want to use. For now, there is only `
 
 The last one is `bootstrap-icons` which are being used throughout the components. 
 
-* At last, remove `ThemeLeptonModule` and import the following modules in `app.module.ts`
+* At last, remove `ThemeLeptonModule` from `app.module.ts` and `shared.module.ts`, and import the following modules in `app.module.ts`
 
 ```js
 import { ThemeLeptonXModule } from '@volosoft/abp.ng.theme.lepton-x';
@@ -154,7 +151,6 @@ import { AbpSideMenuLayoutModule } from '@volosoft/abp.ng.theme.lepton-x/layouts
   // ...
   imports: [
     // ...
-    // ThemeLeptonModule.forRoot(),
     ThemeLeptonXModule.forRoot(),
     AbpSideMenuLayoutModule.forRoot(), // depends on which layout you choose
     // ...
@@ -215,6 +211,6 @@ When the user selects a theme, the corresponding CSS class is added to the `body
 
 ## Conclusion
 
-In this blog post, I've explained how to use the alpha version of the new LeptonX theme for ABP-based solution.s Please, keep in mind that this is an alpha version, and we will continue to work on the LeptonX theme. The APIs are bound to change and breaking changes may be introduced in future versions. 
+In this blog post, I've explained how to use the alpha version of the new LeptonX theme for ABP-based solutions. Please, keep in mind that this is an alpha version, and we will continue to work on the LeptonX theme. The APIs are bound to change and breaking changes may be introduced in future versions. 
 
-We would like you to try it out with the latest version of the ABP Framework and give us feedback at lepton@volosoft.com or open an issue on this repository: https://github.com/volosoft/lepton-theme
+We would like you to try it out with the latest version of the ABP Framework and give us feedback at lepton@volosoft.com or open an issue on this repository: https://github.com/volosoft/lepton-theme

framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzBackgroundWorkerAdapter.cs → framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo/Abp/BackgroundWorkers/Quartz/QuartzPeriodicBackgroundWorkerAdapter.cs

@@ -6,6 +6,7 @@ using Volo.Abp.Threading;
 
 namespace Volo.Abp.BackgroundWorkers.Quartz
 {
+    [DisallowConcurrentExecution]
     public class QuartzPeriodicBackgroundWorkerAdapter<TWorker> : QuartzBackgroundWorkerBase,
         IQuartzBackgroundWorkerAdapter
         where TWorker : IBackgroundWorker

modules/cms-kit/src/Volo.CmsKit.Domain/Volo/CmsKit/Menus/MenuItem.cs

@@ -39,7 +39,7 @@ namespace Volo.CmsKit.Menus
 
         public Guid? PageId { get; protected set; }
 
-        public Guid? TenantId { get; }
+        public Guid? TenantId { get;  protected set; }
 
         public MenuItem(Guid id,
                         [NotNull] string displayName,