-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9716 from abpframework/auto-merge/rel-4-4/507
Merge branch dev with rel-4.4
- Loading branch information
Showing
50 changed files
with
122 additions
and
122 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "packages": [ | ||
| "packs/*" | ||
| ], | ||
|
|
||
This file contains 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
4 changes: 2 additions & 2 deletions
4
npm/packs/aspnetcore.components.server.basictheme/package.json
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/aspnetcore.components.server.basictheme", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/aspnetcore.components.server.theming": "~4.4.0-rc.2" | ||
| "@abp/aspnetcore.components.server.theming": "~4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/aspnetcore.components.server.theming", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/bootstrap": "~4.4.0-rc.2", | ||
| "@abp/font-awesome": "~4.4.0-rc.2" | ||
| "@abp/bootstrap": "~4.4.0", | ||
| "@abp/font-awesome": "~4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/aspnetcore.mvc.ui.theme.basic", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/aspnetcore.mvc.ui.theme.shared": "~4.4.0-rc.2" | ||
| "@abp/aspnetcore.mvc.ui.theme.shared": "~4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/aspnetcore.mvc.ui.theme.shared", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/aspnetcore.mvc.ui": "~4.4.0-rc.2", | ||
| "@abp/bootstrap": "~4.4.0-rc.2", | ||
| "@abp/bootstrap-datepicker": "~4.4.0-rc.2", | ||
| "@abp/datatables.net-bs4": "~4.4.0-rc.2", | ||
| "@abp/font-awesome": "~4.4.0-rc.2", | ||
| "@abp/jquery-form": "~4.4.0-rc.2", | ||
| "@abp/jquery-validation-unobtrusive": "~4.4.0-rc.2", | ||
| "@abp/lodash": "~4.4.0-rc.2", | ||
| "@abp/luxon": "~4.4.0-rc.2", | ||
| "@abp/malihu-custom-scrollbar-plugin": "~4.4.0-rc.2", | ||
| "@abp/select2": "~4.4.0-rc.2", | ||
| "@abp/sweetalert": "~4.4.0-rc.2", | ||
| "@abp/timeago": "~4.4.0-rc.2", | ||
| "@abp/toastr": "~4.4.0-rc.2" | ||
| "@abp/aspnetcore.mvc.ui": "~4.4.0", | ||
| "@abp/bootstrap": "~4.4.0", | ||
| "@abp/bootstrap-datepicker": "~4.4.0", | ||
| "@abp/datatables.net-bs4": "~4.4.0", | ||
| "@abp/font-awesome": "~4.4.0", | ||
| "@abp/jquery-form": "~4.4.0", | ||
| "@abp/jquery-validation-unobtrusive": "~4.4.0", | ||
| "@abp/lodash": "~4.4.0", | ||
| "@abp/luxon": "~4.4.0", | ||
| "@abp/malihu-custom-scrollbar-plugin": "~4.4.0", | ||
| "@abp/select2": "~4.4.0", | ||
| "@abp/sweetalert": "~4.4.0", | ||
| "@abp/timeago": "~4.4.0", | ||
| "@abp/toastr": "~4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/blogging", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/aspnetcore.mvc.ui.theme.shared": "~4.4.0-rc.2", | ||
| "@abp/owl.carousel": "~4.4.0-rc.2", | ||
| "@abp/prismjs": "~4.4.0-rc.2", | ||
| "@abp/tui-editor": "~4.4.0-rc.2" | ||
| "@abp/aspnetcore.mvc.ui.theme.shared": "~4.4.0", | ||
| "@abp/owl.carousel": "~4.4.0", | ||
| "@abp/prismjs": "~4.4.0", | ||
| "@abp/tui-editor": "~4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/chart.js", | ||
| "publishConfig": { | ||
| "access": "public" | ||
|
|
||
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/cms-kit.admin", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/jstree": "~4.4.0-rc.2", | ||
| "@abp/slugify": "~4.4.0-rc.2", | ||
| "@abp/tui-editor": "~4.4.0-rc.2", | ||
| "@abp/uppy": "~4.4.0-rc.2" | ||
| "@abp/jstree": "~4.4.0", | ||
| "@abp/slugify": "~4.4.0", | ||
| "@abp/tui-editor": "~4.4.0", | ||
| "@abp/uppy": "~4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/cms-kit.public", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/highlight.js": "~4.4.0-rc.2", | ||
| "@abp/star-rating-svg": "~4.4.0-rc.2" | ||
| "@abp/highlight.js": "~4.4.0", | ||
| "@abp/star-rating-svg": "~4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/cms-kit", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/cms-kit.admin": "~4.4.0-rc.2", | ||
| "@abp/cms-kit.public": "~4.4.0-rc.2" | ||
| "@abp/cms-kit.admin": "~4.4.0", | ||
| "@abp/cms-kit.public": "~4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/core", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/utils": "^4.4.0-rc.2" | ||
| "@abp/utils": "^4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/docs", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/anchor-js": "~4.4.0-rc.2", | ||
| "@abp/clipboard": "~4.4.0-rc.2", | ||
| "@abp/malihu-custom-scrollbar-plugin": "~4.4.0-rc.2", | ||
| "@abp/popper.js": "~4.4.0-rc.2", | ||
| "@abp/prismjs": "~4.4.0-rc.2" | ||
| "@abp/anchor-js": "~4.4.0", | ||
| "@abp/clipboard": "~4.4.0", | ||
| "@abp/malihu-custom-scrollbar-plugin": "~4.4.0", | ||
| "@abp/popper.js": "~4.4.0", | ||
| "@abp/prismjs": "~4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| { | ||
| "version": "4.4.0-rc.2", | ||
| "version": "4.4.0", | ||
| "name": "@abp/highlight.js", | ||
| "publishConfig": { | ||
| "access": "public" | ||
| }, | ||
| "dependencies": { | ||
| "@abp/core": "~4.4.0-rc.2" | ||
| "@abp/core": "~4.4.0" | ||
| }, | ||
| "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431" | ||
| } |
This file contains 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
This file contains 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
Oops, something went wrong.