Skip to content

Commit 257eba0

Browse files
authored
Merge branch 'dev' into auto-merge/rel-9-2/3727
2 parents 107c2ce + 91b5a34 commit 257eba0

File tree

177 files changed

+1902
-519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+1902
-519
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
blank_issues_enabled: true
1+
blank_issues_enabled: false
22
contact_links:
33
- name: Issue with ABP Commercial
44
url: https://abp.io/support/questions

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
<PackageVersion Include="Quartz.Extensions.DependencyInjection" Version="3.14.0" />
139139
<PackageVersion Include="Quartz.Plugins.TimeZoneConverter" Version="3.14.0" />
140140
<PackageVersion Include="Quartz.Serialization.Json" Version="3.14.0" />
141-
<PackageVersion Include="RabbitMQ.Client" Version="6.8.1" />
141+
<PackageVersion Include="RabbitMQ.Client" Version="7.1.2" />
142142
<PackageVersion Include="Rebus" Version="8.8.0" />
143143
<PackageVersion Include="Rebus.ServiceProvider" Version="10.3.0" />
144144
<PackageVersion Include="Scriban" Version="6.2.1" />

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,33 @@
690690
"Permission:Campaigns": "Campaigns",
691691
"Permission:Licenses": "License Settings",
692692
"BlockUserPolicy": "User Block Policies",
693-
"Permission:BlockUserPolicy": "User Block Policy"
693+
"Permission:BlockUserPolicy": "User Block Policy",
694+
"ManageImages" : "Manage Image",
695+
"ModuleMainImage": "Module Main Image",
696+
"ModuleImageInfo1": "Accepted file types : <strong> JPEG, JPG, PNG, SVG </strong>",
697+
"ModuleImageInfo2": "Max file size : <strong> 1 MB </strong>",
698+
"ModuleImageInfo3": "Image Proportion : <strong> 1:1 </strong>",
699+
"ModuleImageInfo4": "<a href='/images/example-module-img.png' download> Download a sample cover image </a>",
700+
"AreYouSureToDeleteImage": "Are you sure you want to delete this image?",
701+
"CompactPercentage": "Compact Percentage",
702+
"CompactPercentageDescription": "Percentage of cache entries to remove during compaction (1-100)",
703+
"Settings": "Settings",
704+
"MaxSizeOfInMemoryCache": "Max Size Of In Memory Cache",
705+
"MaxSizeOfInMemoryCacheInfo": "Gets or sets the maximum size of the memory cache.",
706+
"SizeOfTriggerAutoCompact": "Size Of Trigger Auto Compact",
707+
"SizeOfTriggerAutoCompactInfo": "Gets or sets the size threshold that triggers auto-compaction. When the cache size exceeds this value, auto-compaction will be performed",
708+
"AutoCompactPercentage": "Auto Compact Percentage",
709+
"AutoCompactPercentageInfo": "Gets or sets the percentage of items to remove when auto-compaction is triggered (1-100)",
710+
"ClearCaches": "This clears all NuGet content cache",
711+
"CacheLatestVersions": "Cache Latest Versions",
712+
"VersionCount": "Version Count",
713+
"VersionCountInfo": "Gets or sets the number of versions to cache",
714+
"IncludeLeptonX": "Include LeptonX",
715+
"IncludeLeptonXInfo": "Gets or sets whether to include LeptonX in the cache",
716+
"IncludePrerelease": "Include Prerelease",
717+
"IncludePrereleaseInfo": "Gets or sets whether to include prerelease versions in the cache",
718+
"CacheVersionCount": "Cache Version Count",
719+
"CacheVersionCountInfo": "Gets or sets the number of versions to cache",
720+
"CacheLatestVersionsInfo": "This caches the latest versions of the NuGet packages"
694721
}
695722
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1886,6 +1886,9 @@
18861886
"FaqIyzicoPaymentIssuesExplanation5": "<strong>Credit/Debit Cards</strong>: Visa, MasterCard, American Express, Discover, Diners Club, JCB",
18871887
"FaqIyzicoPaymentIssuesExplanation6": "<strong>Digital Wallets</strong>: PayPal, AliPay, WebMoney",
18881888
"FaqIyzicoPaymentIssuesExplanation7": "Alternatively, you can send the license amount directly via bank wire transfer. For our bank account details, please visit: <a href='https://volosoft.com/bank-account'>Bank Account Information</a> (use USD currency).",
1889-
"FaqIyzicoPaymentIssuesExplanation8": "ABP website doesn't save or process your credit card. We use payment gateways for this and the entire transaction is handled by payment gateways. We have no authority to interfere with the payment process or fix the payment steps. If you have further questions or need additional support, feel free to contact us at <a href='https://abp.io/contact'>abp.io/contact</a>."
1889+
"FaqIyzicoPaymentIssuesExplanation8": "ABP website doesn't save or process your credit card. We use payment gateways for this and the entire transaction is handled by payment gateways. We have no authority to interfere with the payment process or fix the payment steps. If you have further questions or need additional support, feel free to contact us at <a href='https://abp.io/contact'>abp.io/contact</a>.",
1890+
"BiographyContainsUrlValidationMessage": "Biography cannot contain URL.",
1891+
"CreatePostSEOTitleInfo": "SEO URL is a clean, readable, keyword-rich URL that helps both users and search engines understand what this post is about. Keep it short with 60 characters. SEO titles over 60 characters will be truncated. Use hyphens (-) to separate words (not underscores). Include target keywords near the start. Lowercase only. No stop words unless needed (e.g: \"and\", \"or\", \"the\").",
1892+
"SEOTitle": "SEO URL"
18901893
}
18911894
}

common.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<PropertyGroup>
33
<LangVersion>latest</LangVersion>
4-
<Version>9.1.3</Version>
5-
<LeptonXVersion>4.1.3</LeptonXVersion>
4+
<Version>9.3.0-preview</Version>
5+
<LeptonXVersion>4.3.0-preview</LeptonXVersion>
66
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
77
<PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
88
<PackageProjectUrl>https://abp.io/</PackageProjectUrl>

docs/en/Blog-Posts/2022-03-08 v5_2_Preview/POST.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ We organized the 3rd live [ABP Community Talks](https://community.abp.io/events)
187187
* [Enis Necipoğlu](https://twitter.com/EnisNecipoglu) has also created [an article](https://community.abp.io/posts/using-autofilterer-with-abp-framework-uuqv81jm) to demonstrate how to use his own open source [AutoFilterer](https://github.com/enisn/AutoFilterer) library with the ABP Framework.
188188
* [Jonathan Potts](https://github.com/jonathanpotts) has created his first ABP Community article that shows how to use Bootswatch themes with the ABP Framework. [See it here](https://community.abp.io/posts/customizing-the-abp-basic-theme-with-bootswatch-4luoqzr0).
189189

190-
Thanks to all the contributors. It is appreciated if you want to submit your post and share your knowledge with the ABP community: https://community.abp.io/posts/submit
190+
Thanks to all the contributors. It is appreciated if you want to submit your post and share your knowledge with the ABP community: https://community.abp.io/posts/create
191191

192192
## Conclusion
193193

docs/en/Blog-Posts/2024-02-16 v8_1_Preview/POST.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ There are exciting articles contributed by the ABP community as always. I will h
230230
* [A Best Practice for Designing Interfaces in .NET C#](https://community.abp.io/posts/a-best-practice-for-designing-interfaces-in-.net-c-9xqc4h8d)
231231
* [Invariance, Covariance, and Contravariance in .NET C#](https://community.abp.io/posts/invariance-covariance-and-contravariance-in-.net-c-9blmuhme)
232232

233-
Thanks to the ABP Community for all the content they have published. You can also [post your ABP-related (text or video) content](https://community.abp.io/posts/submit) to the ABP Community.
233+
Thanks to the ABP Community for all the content they have published. You can also [post your ABP-related (text or video) content](https://community.abp.io/posts/create) to the ABP Community.
234234

235235
## Conclusion
236236

docs/en/Blog-Posts/2024-05-21 v8_2_Release/POST.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ There are exciting articles contributed by the ABP community as always. I will h
260260
* [Using FluentValidation with ABP Framework](https://community.abp.io/posts/using-fluentvalidation-with-abp-framework-2cxuwl70) by [Enes Döner](https://community.abp.io/members/Enes)
261261
* [Using Blob Storage with ABP](https://community.abp.io/posts/using-blob-storage-with-abp-framework-jygtmhn4) by [Emre Kendirli](https://community.abp.io/members/emrekenderli)
262262

263-
Thanks to the ABP Community for all the content they have published. You can also [post your ABP-related (text or video) content](https://community.abp.io/posts/submit) to the ABP Community.
263+
Thanks to the ABP Community for all the content they have published. You can also [post your ABP-related (text or video) content](https://community.abp.io/posts/create) to the ABP Community.
264264

265265
## Conclusion
266266

docs/en/Blog-Posts/2024-07-31 v8_3_Preview/post.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ There are exciting articles contributed by the ABP community as always. I will h
168168
* [How to use .NET Aspire with ABP framework](https://abp.io/community/articles/how-to-use-.net-aspire-with-abp-framework-h29km4kk) by [Berkan Şaşmaz](https://twitter.com/berkansasmazz)
169169
* [Exciting New Feature in ABP.IO CMS Kit: Marked Item System](https://abp.io/community/articles/exciting-new-feature-in-abp.io-cms-kit-marked-item-system.-2hvpq0me) by [Suhaib Mousa](https://abp.io/community/members/[email protected])
170170

171-
Thanks to the ABP Community for all the content they have published. You can also [post your ABP-related (text or video) content](https://abp.io/community/posts/submit) to the ABP Community.
171+
Thanks to the ABP Community for all the content they have published. You can also [post your ABP-related (text or video) content](https://abp.io/community/posts/create) to the ABP Community.
172172

173173
## Conclusion
174174

docs/en/Blog-Posts/2024-09-06 v8_3_Release_Stable/POST.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ As always, exciting articles have been contributed by the ABP community. I will
7070
* [Introducing the Google Cloud Storage BLOB Provider](https://abp.io/community/articles/introducing-the-google-cloud-storage-blob-provider-yrt6azc0) by [Engincan Veske](https://twitter.com/EngincanVeske)
7171
* [Switching Between Organization Units](https://abp.io/community/articles/switching-between-organization-units-i5tokpzt) by [Liming Ma](https://github.com/maliming)
7272

73-
Thanks to the ABP Community for all the content they have published. You can also [post your ABP-related (text or video) content](https://abp.io/community/posts/submit) to the ABP Community.
73+
Thanks to the ABP Community for all the content they have published. You can also [post your ABP-related (text or video) content](https://abp.io/community/posts/create) to the ABP Community.
7474

7575
## About the Next Version
7676

0 commit comments

Comments
 (0)