Auto-merge forward rel-10.7 → dev - #26145
Merged
Merged
Conversation
…ngular-source # Conflicts: # modules/cms-kit/angular/package.json # modules/cms-kit/angular/projects/cms-kit/package.json
- Add NavigationManager.ResolveBrandingUrl and ResolveBrandingCssUrl - Move the url rules to Volo.Abp.Ui.Branding.BrandingUrlHelper, shared with the mvc themes
…base Resolve `IBrandingProvider` urls in the Blazor themes
…ource Remove unused Angular scaffold from CmsKit module
# Conflicts: # npm/ng-packs/package.json # npm/packs/aspnetcore.mvc.ui.theme.shared/package.json # npm/packs/blogging/package.json # npm/packs/bootstrap-daterangepicker/package.json # npm/packs/docs/package.json # npm/packs/jquery-form/package.json # npm/packs/jquery-validation-unobtrusive/package.json # npm/packs/malihu-custom-scrollbar-plugin/package.json # npm/packs/swiper/package.json # npm/packs/timeago/package.json # npm/packs/toastr/package.json # templates/app-nolayers/angular/package.json # templates/app/angular/package.json # templates/module/angular/package.json # templates/module/angular/projects/my-project-name/package.json
maliming
enabled auto-merge
September 9, 2026 13:38
maliming
approved these changes
Sep 9, 2026
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## dev #26145 +/- ##
==========================================
+ Coverage 49.78% 49.81% +0.03%
==========================================
Files 3833 3835 +2
Lines 134256 134320 +64
Branches 10187 10199 +12
==========================================
+ Hits 66836 66915 +79
+ Misses 65398 65380 -18
- Partials 2022 2025 +3 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated forward merge of
rel-10.7intodev.Merge conflict: this branch is `${SOURCE}` as-is. Resolve against `${TARGET}` before merging.