Skip to content
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

Merge branch dev with rel-8.3 #20350

Merged
merged 1 commit into from
Jul 31, 2024
Merged

Merge branch dev with rel-8.3 #20350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "asp.net",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.shared": "~8.2.1",
"@abp/prismjs": "~8.2.1",
"@abp/highlight.js": "~8.2.1"
"@abp/aspnetcore.mvc.ui.theme.shared": "~8.3.0-rc.1",
"@abp/prismjs": "~8.3.0-rc.1",
"@abp/highlight.js": "~8.3.0-rc.1"
}
}
406 changes: 197 additions & 209 deletions modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "asp.net",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.1",
"@abp/prismjs": "~8.2.1"
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.0-rc.1",
"@abp/prismjs": "~8.3.0-rc.1"
},
"devDependencies": {}
}
404 changes: 207 additions & 197 deletions modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/blogging/app/Volo.BloggingTestApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "volo.blogtestapp",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.1",
"@abp/blogging": "~8.2.1"
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.0-rc.1",
"@abp/blogging": "~8.3.0-rc.1"
}
}
446 changes: 228 additions & 218 deletions modules/blogging/app/Volo.BloggingTestApp/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "client-simulation-web",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.1"
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.0-rc.1"
}
}
374 changes: 192 additions & 182 deletions modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions modules/cms-kit/angular/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
},
"private": true,
"dependencies": {
"@abp/ng.account": "~8.2.1",
"@abp/ng.identity": "~8.2.1",
"@abp/ng.setting-management": "~8.2.1",
"@abp/ng.tenant-management": "~8.2.1",
"@abp/ng.theme.basic": "~8.2.1",
"@abp/ng.account": "~8.3.0-rc.1",
"@abp/ng.identity": "~8.3.0-rc.1",
"@abp/ng.setting-management": "~8.3.0-rc.1",
"@abp/ng.tenant-management": "~8.3.0-rc.1",
"@abp/ng.theme.basic": "~8.3.0-rc.1",
"@angular/animations": "~10.0.0",
"@angular/common": "~10.0.0",
"@angular/compiler": "~10.0.0",
Expand Down
4 changes: 2 additions & 2 deletions modules/cms-kit/angular/projects/cms-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"peerDependencies": {
"@angular/common": "^9.1.11",
"@angular/core": "^9.1.11",
"@abp/ng.core": ">=8.2.1",
"@abp/ng.theme.shared": ">=8.2.1"
"@abp/ng.core": ">=8.3.0-rc.1",
"@abp/ng.theme.shared": ">=8.3.0-rc.1"
},
"dependencies": {
"tslib": "^2.0.0"
Expand Down
2 changes: 1 addition & 1 deletion modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "my-app-identityserver",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.1"
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.0-rc.1"
}
}
374 changes: 192 additions & 182 deletions modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.1"
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.0-rc.1"
}
}
374 changes: 192 additions & 182 deletions modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "my-app",
"private": true,
"dependencies": {
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.2.1",
"@abp/cms-kit": "8.2.1"
"@abp/aspnetcore.mvc.ui.theme.basic": "~8.3.0-rc.1",
"@abp/cms-kit": "8.3.0-rc.1"
}
}
Loading
Loading