From 4cd0738f5c8103810c087c1e8dfbf73701dd3f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 18 May 2022 14:17:05 +0300 Subject: [PATCH 1/4] Added books to the document list --- docs/en/docs-nav.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docs/en/docs-nav.json b/docs/en/docs-nav.json index ac76c7cee8..2d1348f695 100644 --- a/docs/en/docs-nav.json +++ b/docs/en/docs-nav.json @@ -1313,6 +1313,19 @@ } ] }, + { + "text": "Books", + "items": [ + { + "text": "Mastering ABP Framework", + "path": "https://abp.io/books/mastering-abp-framework" + }, + { + "text": "Implementing Domain Driven Design", + "path": "https://abp.io/books/implementing-domain-driven-design" + } + ] + }, { "text": "Release Information", "items": [ From 871c72894bd432d8ee13f81a38c7de72ed4951de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 18 May 2022 17:50:02 +0300 Subject: [PATCH 2/4] Added Discord Badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c8526a9daa..2c06ebc5be 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![NuGet (with prereleases)](https://img.shields.io/nuget/vpre/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) [![MyGet (nightly builds)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://docs.abp.io/en/abp/latest/Nightly-Builds) [![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) +![Discord](https://img.shields.io/discord/951497912645476422?label=Discord) ABP Framework is a complete **infrastructure** based on the **ASP.NET Core** to create **modern web applications** and **APIs** by following the software development **best practices** and the **latest technologies**. Check out https://abp.io From 9ec78a763a332e17122efbd6c55b0a9568723883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Wed, 18 May 2022 17:53:43 +0300 Subject: [PATCH 3/4] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c06ebc5be..676398b72e 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,8 @@ [![NuGet (with prereleases)](https://img.shields.io/nuget/vpre/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) [![MyGet (nightly builds)](https://img.shields.io/myget/abp-nightly/vpre/Volo.Abp.svg?style=flat-square)](https://docs.abp.io/en/abp/latest/Nightly-Builds) [![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) -![Discord](https://img.shields.io/discord/951497912645476422?label=Discord) + +[![ABP Discord server](https://img.shields.io/discord/951497912645476422?label=Discord)](https://discord.gg/abp) ABP Framework is a complete **infrastructure** based on the **ASP.NET Core** to create **modern web applications** and **APIs** by following the software development **best practices** and the **latest technologies**. Check out https://abp.io From f01f534293d0cbcc9864b23c1b6879fe0f4c1863 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 19 May 2022 10:43:27 +0800 Subject: [PATCH 4/4] Check `ReturnUrl` not null. --- .../Pages/Account/Manage.cshtml.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs index 746992822c..d669ec41a1 100644 --- a/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs +++ b/modules/account/src/Volo.Abp.Account.Web/Pages/Account/Manage.cshtml.cs @@ -34,11 +34,14 @@ public class ManageModel : AccountPageModel await contributor.ConfigureAsync(ProfileManagementPageCreationContext); } - if (!Url.IsLocalUrl(ReturnUrl) && - !ReturnUrl.StartsWith(UriHelper.BuildAbsolute(Request.Scheme, Request.Host, Request.PathBase).RemovePostFix("/")) && - !AppUrlProvider.IsRedirectAllowedUrl(ReturnUrl)) + if (ReturnUrl != null) { - ReturnUrl = null; + if (!Url.IsLocalUrl(ReturnUrl) && + !ReturnUrl.StartsWith(UriHelper.BuildAbsolute(Request.Scheme, Request.Host, Request.PathBase).RemovePostFix("/")) && + !AppUrlProvider.IsRedirectAllowedUrl(ReturnUrl)) + { + ReturnUrl = null; + } } return Page();