Skip to content

Merge branch dev with rel-10.0 #24085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 31, 2025
+2 −4
Merged

Merge branch dev with rel-10.0 #24085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7fd8fe
Remove unused Toc.init and fix link formatting
maliming Oct 31, 2025
6979452
Handle additional hash in scrollToHashLink
maliming Oct 31, 2025
11221c3
Update build-all.ps1
maliming Oct 31, 2025
85bdd06
Merge pull request #24081 from abpframework/docs-vs.js.patch
maliming Oct 31, 2025
89062b9
Merge pull request #24083 from abpframework/auto-merge/rel-9-3/4089
maliming Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/docs/app/VoloDocs.Web/Pages/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
<abp-alert alert-type="Warning">
<strong>No projects found!</strong><br />
See <a href=" https://abp.io/docs/latest/modules/docs">documentation</a> to see how you can create a new one.
See <a href="https://abp.io/docs/latest/modules/docs">documentation</a> to see how you can create a new one.
</abp-alert>
}
else
Expand Down
4 changes: 1 addition & 3 deletions modules/docs/src/Volo.Docs.Web/Pages/Documents/Shared/Scripts/vs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
var scrollToHashLink = function () {
var hash = window.location.hash;

if (!hash || hash === '#') {
if (!hash || hash === '#' || hash === '#gsc.tab=0') {
return;
}

Expand Down Expand Up @@ -69,8 +69,6 @@
return;
}

Toc.init($myNav);

$('body').scrollspy({
target: $myNav,
offset:100
Expand Down
Loading