From c0c7890435c76cded2bcb736ab358c9f720c8560 Mon Sep 17 00:00:00 2001 From: Masum ULU Date: Fri, 5 May 2023 17:36:56 +0300 Subject: [PATCH 1/6] bump up TS versions --- npm/ng-packs/package.json | 2 +- npm/ng-packs/packages/schematics/package.json | 2 +- .../schematics/src/utils/angular/latest-versions/package.json | 2 +- npm/ng-packs/scripts/package.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index eff2999101..fd93b8be9b 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -127,7 +127,7 @@ "tsickle": "^0.39.1", "tslib": "^2.3.0", "tslint": "~6.1.0", - "typescript": "4.8.4", + "typescript": "~4.8.4", "zone.js": "0.11.4" }, "dependencies": {}, diff --git a/npm/ng-packs/packages/schematics/package.json b/npm/ng-packs/packages/schematics/package.json index 1c0c39745a..2f9d5bd56b 100644 --- a/npm/ng-packs/packages/schematics/package.json +++ b/npm/ng-packs/packages/schematics/package.json @@ -15,7 +15,7 @@ "got": "^11.5.2", "jsonc-parser": "^2.3.0", "should-quote": "^1.0.0", - "typescript": "4.8.4" + "typescript": "~4.8.4" }, "devDependencies": { "@schematics/angular": "~14.2.1", diff --git a/npm/ng-packs/packages/schematics/src/utils/angular/latest-versions/package.json b/npm/ng-packs/packages/schematics/src/utils/angular/latest-versions/package.json index c04d111f07..600b1c9fc1 100644 --- a/npm/ng-packs/packages/schematics/src/utils/angular/latest-versions/package.json +++ b/npm/ng-packs/packages/schematics/src/utils/angular/latest-versions/package.json @@ -17,7 +17,7 @@ "rxjs": "~7.5.0", "tslib": "^2.3.0", "ts-node": "~10.9.0", - "typescript": "~4.8.2", + "typescript": "~4.8.4", "zone.js": "~0.12.0" } } diff --git a/npm/ng-packs/scripts/package.json b/npm/ng-packs/scripts/package.json index 92cb001545..c187b58d44 100644 --- a/npm/ng-packs/scripts/package.json +++ b/npm/ng-packs/scripts/package.json @@ -27,6 +27,6 @@ "esm": "^3.2.25", "ts-node": "^10.9.1", "tsconfig-paths": "^3.9.0", - "typescript": "4.7.4" + "typescript": "~4.8.4" } } From afeaa7623aeea5237bcb00f166578e9eac4347a6 Mon Sep 17 00:00:00 2001 From: Masum ULU Date: Fri, 5 May 2023 19:28:22 +0300 Subject: [PATCH 2/6] fix lint error --- npm/ng-packs/packages/schematics/src/utils/methods.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/schematics/src/utils/methods.ts b/npm/ng-packs/packages/schematics/src/utils/methods.ts index 4c2684f1c0..6767adf540 100644 --- a/npm/ng-packs/packages/schematics/src/utils/methods.ts +++ b/npm/ng-packs/packages/schematics/src/utils/methods.ts @@ -1,6 +1,6 @@ -// eslint-disable-next-line @typescript-eslint/no-var-requires import { camel } from './text'; +// eslint-disable-next-line @typescript-eslint/no-var-requires const shouldQuote = require('should-quote'); export const getParamName = (paramName: string) => shouldQuote(paramName) ? `["${paramName}"]` : paramName; From 780e97fb0f06f69404244e2d0da58e3aa6a13860 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 16 May 2023 09:39:19 +0300 Subject: [PATCH 3/6] Update common.props --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index f130f4bc7f..adfdf9a213 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 7.2.1 + 7.2.2 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ From bcae32afe27b40a92042cf7e0ff00a9f5dc35ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20P=C4=B1=C3=A7akc=C4=B1?= <98148844+onurpicakci@users.noreply.github.com> Date: Tue, 16 May 2023 15:42:12 +0300 Subject: [PATCH 4/6] blogging: created css file for detail page --- .../Pages/Blogs/Posts/Detail.cshtml | 1 + .../Pages/Blogs/Posts/detail.css | 27 +++++++++++++++++++ .../Pages/Blogs/Shared/Styles/blog.css | 27 ------------------- 3 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.css diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml index 9c44b0feb2..ed94556d78 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/Detail.cshtml @@ -47,6 +47,7 @@ + } diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.css new file mode 100644 index 0000000000..7bf7612836 --- /dev/null +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Posts/detail.css @@ -0,0 +1,27 @@ +.last-post-title{ + font-size: 15px; + line-height: 20px; + font-weight: 700; + letter-spacing: 0px; + text-decoration: none; + color: black; +} +.last-post-image{ + width: 30px; + height: 30px; + border-top-left-radius: 50%; + border-top-right-radius: 50%; + border-bottom-right-radius: 50%; + border-bottom-left-radius: 50%; +} +.last-post-name{ + padding-right: 2px; + max-height: 16px; + padding-top: 0.5em; + padding-right: 0.5em; +} +#CopyLink{ + padding: 0; + border: none; + background: none; +} \ No newline at end of file diff --git a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css index b24425f547..d158489f70 100644 --- a/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css +++ b/modules/blogging/src/Volo.Blogging.Web/Pages/Blogs/Shared/Styles/blog.css @@ -320,31 +320,4 @@ div.vs-blog { text-decoration: none; } div.vs-blog > .form-group { margin: 0 !important; } -.last-post-title{ - font-size: 15px; - line-height: 20px; - font-weight: 700; - letter-spacing: 0px; - text-decoration: none; - color: black; -} -.last-post-image{ - width: 30px; - height: 30px; - border-top-left-radius: 50%; - border-top-right-radius: 50%; - border-bottom-right-radius: 50%; - border-bottom-left-radius: 50%; -} -.last-post-name{ - padding-right: 2px; - max-height: 16px; - padding-top: 0.5em; - padding-right: 0.5em; -} -#CopyLink{ - padding: 0; - border: none; - background: none; -} From c4548da1a43bfd3c8e25a3ff9d57a89d3d06919f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Onur=20P=C4=B1=C3=A7akc=C4=B1?= <98148844+onurpicakci@users.noreply.github.com> Date: Wed, 17 May 2023 11:00:08 +0300 Subject: [PATCH 5/6] commercial.abp.io: added localization for the trial page --- .../Commercial/Localization/Resources/en.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 9efe75ad7e..778da632a8 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -841,6 +841,7 @@ "BlazoriseSupportExplanation2": "Verify your email address by checking your email box. Check your spam box if you don't see an email in your inbox!", "BlazoriseSupportExplanation3": "Log into the Blazorise support website at blazorise.com/support/login.", "BlazoriseSupportExplanation4": "If you have an active ABP Commercial license, you will also have a Blazorise PRO license. You can get your Blazorise license key at blazorise.com/support/user/manage/license.", - "BlazoriseSupportExplanation5": "You can post your questions on the support website and generate a product token for your application." + "BlazoriseSupportExplanation5": "You can post your questions on the support website and generate a product token for your application.", + "AbpLiveTrainingPackages": "ABP Live Training Packages" } } From 59eece52d8c35792bcb5847a51de6676bc5524b5 Mon Sep 17 00:00:00 2001 From: Gizem Mutu Kurt <99716457+gizemmutukurt@users.noreply.github.com> Date: Wed, 17 May 2023 15:07:00 +0300 Subject: [PATCH 6/6] Update latest-versions.json 7.2.1 to 7.2.2 --- latest-versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/latest-versions.json b/latest-versions.json index e291aaffe5..ee5249ef27 100644 --- a/latest-versions.json +++ b/latest-versions.json @@ -1,6 +1,6 @@ [ { - "version": "7.2.1", + "version": "7.2.2", "releaseDate": "", "type": "stable", "message": ""