Merge branch 'dev' into pr/21965

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

@@ -685,6 +685,7 @@
     "RedisManagement": "Redis Management",
     "Permission:RedisManagement": "Redis Management",
     "UserCleanUp": "User Clean Up",
-    "Permission:UserCleanUp": "User Clean Up"
+    "Permission:UserCleanUp": "User Clean Up",
+    "AllowPrivateQuestion": "Allow Private Question"
   }
 }

docs/en/Community-Articles/2024-12-01-OpenAI-Integration/POST.md

@@ -62,6 +62,8 @@ dotnet add package Microsoft.Extensions.AI.OpenAI --prerelease
 
 > Replace the value of the `Key` with your OpenAI API key.
 
+> **Important Security Note**: Storing sensitive information like API keys in `appsettings.json` is not recommended due to security concerns. Please refer to the [official Microsoft documentation](https://learn.microsoft.com/en-us/aspnet/core/security/app-secrets) for secure secret management best practices.
+
 Next, add the following code to the `ConfigureServices` method in `OpenAIIntegrationBlazorModule`:
 
 ```csharp

docs/en/framework/ui/mvc-razor-pages/tag-helpers/form-elements.md

@@ -10,7 +10,7 @@ See the [form elements demo page](https://bootstrap-taghelpers.abp.io/Components
 
 ## abp-input
 
-`abp-input` tag creates a Bootstrap form input for a given c# property. It uses [Asp.Net Core Input Tag Helper](https://docs.microsoft.com/en-us/aspnet/core/mvc/views/working-with-forms?view=aspnetcore-7.0#the-input-tag-helper) in background, so every data annotation attribute of `input` tag helper of Asp.Net Core is also valid for `abp-input`.
+`abp-input` tag creates a Bootstrap form input for a given c# property. It uses [Asp.Net Core Input Tag Helper](https://docs.microsoft.com/en-us/aspnet/core/mvc/views/working-with-forms?view=aspnetcore-9.0#the-input-tag-helper) in background, so every data annotation attribute of `input` tag helper of Asp.Net Core is also valid for `abp-input`.
 
 Usage:
 
@@ -89,7 +89,7 @@ You can set some of the attributes on your c# property, or directly on HTML tag.
 * `required-symbol`: Adds the required symbol `(*)` to the label when the input is required. The default value is `True`.
 * `floating-label`: Sets the label as floating label. The default value is `False`.
 
-`asp-format`, `name` and `value` attributes of [Asp.Net Core Input Tag Helper](https://docs.microsoft.com/en-us/aspnet/core/mvc/views/working-with-forms?view=aspnetcore-7.0#the-input-tag-helper) are also valid for `abp-input` tag helper.
+`asp-format`, `name` and `value` attributes of [Asp.Net Core Input Tag Helper](https://docs.microsoft.com/en-us/aspnet/core/mvc/views/working-with-forms?view=aspnetcore-9.0#the-input-tag-helper) are also valid for `abp-input` tag helper.
 
 ### Label & Localization
 
@@ -101,7 +101,7 @@ You can set the label of the input in several ways:
 
 ## abp-select
 
-`abp-select` tag creates a Bootstrap form select for a given c# property. It uses [ASP.NET Core Select Tag Helper](https://docs.microsoft.com/tr-tr/aspnet/core/mvc/views/working-with-forms?view=aspnetcore-3.1#the-select-tag-helper) in background, so every data annotation attribute of `select` tag helper of ASP.NET Core is also valid for `abp-select`.
+`abp-select` tag creates a Bootstrap form select for a given c# property. It uses [ASP.NET Core Select Tag Helper](https://docs.microsoft.com/en-us/aspnet/core/mvc/views/working-with-forms?view=aspnetcore-9.0#the-select-tag-helper) in background, so every data annotation attribute of `select` tag helper of ASP.NET Core is also valid for `abp-select`.
 
 `abp-select` tag needs a list of `Microsoft.AspNetCore.Mvc.Rendering.SelectListItem ` to work. It can be provided by `asp-items` attriube on the tag or `[SelectItems()]` attribute on c# property. (if you are using [abp-dynamic-form](dynamic-forms.md), c# attribute is the only way.)
 
@@ -432,4 +432,4 @@ newPicker.insertAfter($('body'));
 * `startDateName`: Sets the name of the hidden start date input.
 * `endDateName`: Sets the name of the hidden end date input.
 * `dateName`: Sets the name of the hidden date input.
-* Other [datepicker options](https://www.daterangepicker.com/#options). Eg: `startDate: "2020-01-01"`.
+* Other [datepicker options](https://www.daterangepicker.com/#options). Eg: `startDate: "2020-01-01"`.

docs/en/modules/account/idle-session-timeout.md

@@ -6,7 +6,7 @@ The `Idle Session Timeout` feature allows you to automatically log out users aft
 
 You can enable/disable the `Idle Session Timeout` feature in the `Setting > Account > Idle Session Timeout` page.
 
-The default idle session timeout is 1 hour. You can change it by selecting a different value from the dropdown list or entering a custom value(in minutes).
+The default idle session timeout is 1 hour. You can change it by selecting a different value from the dropdown list or entering a custom value (in minutes).
 
 ![idle-setting](../../images/idle-setting.png)
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs

@@ -106,11 +106,11 @@ protected virtual async Task<string> GetPageAsync(TagHelperContext context, TagH
     protected virtual async Task<string> GetPreviousButtonAsync(TagHelperContext context, TagHelperOutput output)
     {
         var localizationKey = "PagerPrevious";
-        var currentPage = TagHelper.Model.CurrentPage == 1
-            ? TagHelper.Model.CurrentPage.ToString()
-            : (TagHelper.Model.CurrentPage - 1).ToString();
+        var currentPage = TagHelper.Model.CurrentPage > 1
+            ? (TagHelper.Model.CurrentPage - 1).ToString()
+            : "1";
         return
-            "<li class=\"page-item " + (TagHelper.Model.CurrentPage == 1 ? "disabled" : "") + "\">\r\n" +
+            "<li class=\"page-item " + (TagHelper.Model.CurrentPage <= 1 ? "disabled" : "") + "\">\r\n" +
             (await RenderAnchorTagHelperLinkHtmlAsync(context, output, currentPage, localizationKey)) + "                </li>";
     }