Browse Source

Merge branch 'dev' of https://github.com/abpframework/abp into dev

pull/16236/head
Ebicoglu 4 years ago
parent
commit
0b6f9ee915
  1. 4
      abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/tr.json
  2. 1
      abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/tr.json
  3. 2
      abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/tr.json
  4. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/tr.json
  5. 2
      docs/en/Getting-Started-React-Native.md
  6. 4
      docs/en/Migration-Guides/Abp-7_1.md
  7. 13
      docs/en/Migration-Guides/Abp-7_2.md
  8. 1
      docs/en/Migration-Guides/Index.md
  9. 4
      framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs
  10. 2
      framework/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj
  11. 1
      framework/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpConsts.cs
  12. 31
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/AbpAspNetCoreMvcUiBootstrapDemoModule.cs
  13. 10
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/BootstrapDemoBrandingProvider.cs
  14. 93
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Menus/BootstrapDemoMenuContributor.cs
  15. 34
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Menus/BootstrapDemoMenus.cs
  16. 3
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/_ViewStart.cshtml
  17. BIN
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/imgs/demo/abp-io-light.png
  18. 10
      modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/styles/my-global-styles.css
  19. 8
      npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts
  20. 4
      nupkg/pack.ps1

4
abp_io/AbpIoLocalization/AbpIoLocalization/Base/Localization/Resources/tr.json

@ -22,17 +22,13 @@
"Features": "Özellikler",
"GetStarted": "Başlayın",
"Documents": "Dokümanlar",
"Community": "Topluluk",
"ContributionGuide": "Katkı Rehberi",
"Blog": "Blog",
"Commercial": "Ticari",
"MyAccount": "Hesabım",
"Permission:License": "Lisans",
"Permission:UserInfo": "kullanıcı bilgisi",
"SeeDocuments": "Dokümanlara Göz Atın",
"Samples": "Örnekler",
"Framework": "Çerçeve",
"Support": "Destek",
"FreeDDDBook": "Ücretsiz DDD Kitabı",
"New": "Yeni",
"Volo.AbpIo.Domain:020005": "Lisans uzatma yılı {MinExtendLicenseYear} yıldan az {MaxExtendLicenseYear} yıldan fazla olamaz.",

1
abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/tr.json

@ -417,7 +417,6 @@
"RenewLicenseEarly": "Lisansımı erken yenilersem, tüm yılı alacak mıyım?",
"RenewLicenseEarylExplanation": "Lisansınızı lisans bitiş tarihinizden önce yenilediğinizde, lisans bitiş tarihinize 1 yıl eklenecektir. Örneğin, lisansınızın süresi {0}-06-06 tarihinde doluyorsa ve lisansınızı {0}-01-01 tarihinde yenilediyseniz, yeni lisans bitiş tarihiniz {1}-06-06 olacaktır.",
"OpenSourceWebApplication": "Açık Kaynak Web Uygulaması",
"CompleteWebDevelopment": "Tam Web Geliştirme",
"ABPFrameworkDescription": "ABP Framework, yazılım geliştirme ve sözleşmelerin en iyi uygulamalarını takip ederek modern web uygulamaları oluşturmak için eksiksiz bir altyapıdır.",
"CommunityDescription": "ABP Çerçevesi ile ilgili deneyimlerinizi paylaşın!",
"GetStarted": "Başlayın",

2
abp_io/AbpIoLocalization/AbpIoLocalization/Community/Localization/Resources/tr.json

@ -93,7 +93,6 @@
"NoThanks": "Hayır teşekkürler",
"MaybeLater": "Belki sonra",
"JoinOurPostNewsletter": "Makale bültenimize katılın",
"Community": "Topluluk",
"Marketing": "Pazarlama",
"CommunityPrivacyPolicyConfirmation": "Şartlar ve Koşullar ile <a href=\"https://commercial.abp.io/Privacy\">Gizlilik Politikası</a>'nı kabul ediyorum.",
"PostRequestMessageTitle": "Bu web sitesinde görmek istediğiniz bir makaleyi/eğiticiyi istemek için GitHub'da <a href=\"https://github.com/abpframework/abp/issues/new\">bir sorun açın</a>.",
@ -143,7 +142,6 @@
"Volo.AbpIo.Domain:060002": "Makale İçeriği Github(\"{PostUrl}\") kaynağında mevcut değil.",
"Volo.AbpIo.Domain:060003": "Makale içeriği bulunamadı!",
"MemberNotPublishedPostYet": "Bu üye henüz bir gönderi yayınlamadı.",
"WelcomeToABP": "ABP'ye Hoşgeldiniz",
"Browse": "Göz at",
"ArticleRequestsDescription": "Burada belirli bir içerik mi görmek istiyorsunuz? Topluluktan bunu oluşturmasını isteyebilirsiniz!",
"LatestContentRequests": "Son İçerik Talepleri",

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/tr.json

@ -285,7 +285,6 @@
"Database": "Veritabanı",
"Saas": "Saas",
"OpenSourceWebApp": " Açık <span class=\"forever\">kaynak </span> <br/> web uygulaması",
"Framework": "Çerçeve",
"AuditLoggingExplanation": "Sisteminizdeki tüm işlemleri ve veri değişikliklerini otomatik olarak izleyin.",
"AbpNewCommandExplanation": "ABP başlangıç şablonlarını kullanarak yeni çözümler oluşturur.",
"AbpAddModuleCommandExplanation": "Çözümünüze önceden oluşturulmuş uygulama modülleri yükler",
@ -300,10 +299,8 @@
"Preview": "Önizleme",
"CreateANewSolution": "Yeni bir çözüm oluşturun",
"ABPFrameworkFeatures": "ABP Çerçevesi <span class=\"gradient-framework\">Özellikleri</span>",
"Commercial": "Ticari",
"ThirdPartyTools": "Üçüncü taraf araçlar",
"Back": "Geri",
"Community": "Topluluk",
"SeeMore": "Daha fazla göster",
"DetailsOfTheEBook": "E-kitap detayları",
"JoinOurMarketingNewsletter": "Pazarlama bültenimize katılın",

2
docs/en/Getting-Started-React-Native.md

@ -56,7 +56,7 @@ Please do the following:
> When you are using OpenIddict, You should remove 'clientSecret' on Environment.js (if exists) and disable "HTTPS-only" settings. (Openiddict has default since Version 6.0)
### How to disable Https-only in Openiddict.
You should add this code on `MyProjectName`HttpApiHostModule.
You should add this code on {{ if Tiered == "No" }}`MyProjectNameHttpApiHostModule`{{ else if Tiered == "Yes" }}`MyProjectNameAuthServerModule`{{ end }}.
```csharp
public override void PreConfigureServices(ServiceConfigurationContext context)

4
docs/en/Migration-Guides/Abp-7_1.md

@ -2,6 +2,8 @@
This document is a guide for upgrading ABP v7.0 solutions to ABP v7.1. There are a few changes in this version that may affect your applications, please read it carefully and apply the necessary changes to your application.
> **Note**: Entity Framework developers may need to add a new code-first database migration to their projects since we made some improvements to the existing entities of some application modules.
## Navigation Menu - `CustomData` type changed to `Dictionary<string, object>`
`ApplicationMenu` and `ApplicationMenuItem` classes' `CustomData` property type has been changed to `Dictionary<string, object>`. So, if you use the optional `CustomData` property of these classes, change it accordingly. See [#15608](https://github.com/abpframework/abp/pull/15608) for more information.
@ -16,4 +18,4 @@ var menu = new ApplicationMenu("Home", L["Home"], "/", customData: new MyCustomD
```csharp
var menu = new ApplicationMenu("Home", L["Home"], "/").WithCustomData("CustomDataKey", new MyCustomData());
```
```

13
docs/en/Migration-Guides/Abp-7_2.md

@ -0,0 +1,13 @@
# ABP Version 7.2 Migration Guide
This document is a guide for upgrading ABP v7.1 solutions to ABP v7.2. There are a few changes in this version that may affect your applications, please read it carefully and apply the necessary changes to your application.
## `LastPasswordChangeTime` and `ShouldChangePasswordOnNextLogin` Properties Added to the `IdentityUser` Class
In this version, two new properties, which are `LastPasswordChangeTime` and `ShouldChangePasswordOnNextLogin` have been added to the `IdentityUser` class and to the corresponding entity. Therefore, you may need to create a new migration and apply it to your database.
## Renamed `OnRegistered` Method
There was a typo in an extension method, named as `OnRegistred`. In this version, we have fixed the typo and renamed the method as `OnRegistered`. Also, we have updated the related places in our modules that use this method.
However, if you have used this method in your projects, you need to rename it as `OnRegistered` in your code.

1
docs/en/Migration-Guides/Index.md

@ -2,6 +2,7 @@
The following documents explain how to migrate your existing ABP applications. We write migration documents only if you need to take an action while upgrading your solution. Otherwise, you can easily upgrade your solution using the [abp update command](../Upgrading.md).
- [7.1 to 7.2](Abp-7_2.md)
- [7.0 to 7.1](Abp-7_1.md)
- [6.0 to 7.0](Abp-7_0.md)
- [5.3 to 6.0](Abp-6_0.md)

4
framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Cors/AbpCorsPolicyBuilderExtensions.cs

@ -1,11 +1,11 @@
using Microsoft.AspNetCore.Cors.Infrastructure;
using Volo.Abp.Http;
namespace Microsoft.AspNetCore.Cors;
public static class AbpCorsPolicyBuilderExtensions
{
public static CorsPolicyBuilder WithAbpExposedHeaders(this CorsPolicyBuilder corsPolicyBuilder)
{
return corsPolicyBuilder.WithExposedHeaders("_AbpErrorFormat");
return corsPolicyBuilder.WithExposedHeaders(AbpHttpConsts.AbpErrorFormat).WithExposedHeaders(AbpHttpConsts.AbpTenantResolveError);
}
}

2
framework/src/Volo.Abp.Castle.Core/Volo.Abp.Castle.Core.csproj

@ -15,7 +15,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Castle.Core" Version="5.0.0" />
<PackageReference Include="Castle.Core" Version="5.1.1" />
<PackageReference Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
</ItemGroup>

1
framework/src/Volo.Abp.Http/Volo/Abp/Http/AbpHttpConsts.cs

@ -3,4 +3,5 @@
public static class AbpHttpConsts
{
public const string AbpErrorFormat = "_AbpErrorFormat";
public const string AbpTenantResolveError = "Abp-Tenant-Resolve-Error";
}

31
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/AbpAspNetCoreMvcUiBootstrapDemoModule.cs

@ -1,8 +1,12 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Hosting;
using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Menus;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling;
using Volo.Abp.Autofac;
using Volo.Abp.Modularity;
using Volo.Abp.UI.Navigation;
namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo;
@ -26,4 +30,31 @@ public class AbpAspNetCoreMvcUiBootstrapDemoModule : AbpModule
app.UseStaticFiles();
app.UseConfiguredEndpoints();
}
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpBundlingOptions>(options =>
{
options.StyleBundles
.Get(StandardBundles.Styles.Global)
.AddFiles("/css/demo.css");
} );
Configure<AbpNavigationOptions>(options =>
{
options.MenuContributors.Add(new BootstrapDemoMenuContributor());
});
Configure<AbpBundlingOptions>(options =>
{
options.StyleBundles.Configure(
StandardBundles.Styles.Global,
bundleConfiguration =>
{
bundleConfiguration.AddFiles("/styles/my-global-styles.css");
}
);
});
}
}

10
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/BootstrapDemoBrandingProvider.cs

@ -0,0 +1,10 @@
using Volo.Abp.Ui.Branding;
namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo;
public class BootstrapDemoBrandingProvider : DefaultBrandingProvider
{
public override string AppName => "Bootstrap Tag Helpers";
public override string LogoUrl => "/imgs/demo/abp-io-light.png";
}

93
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Menus/BootstrapDemoMenuContributor.cs

@ -0,0 +1,93 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Pages.Menus;
using Volo.Abp.UI.Navigation;
namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.Menus;
public class BootstrapDemoMenuContributor : IMenuContributor
{
public Task ConfigureMenuAsync(MenuConfigurationContext context)
{
if (context.Menu.Name == StandardMenus.Main)
{
AddMainMenuItems(context);
}
return Task.CompletedTask;
}
private void AddMainMenuItems(MenuConfigurationContext context)
{
var menuItem = new ApplicationMenuItem(BootstrapDemoMenus.Components.Root, "Components");
var items = new List<ApplicationMenuItem>()
{
new ApplicationMenuItem(BootstrapDemoMenus.Components.Alerts, "Alerts", url: "/Components/Alerts"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Badges, "Badges", url: "/Components/Badges"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Borders, "Borders", url: "/Components/Borders"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Breadcrumbs, "Breadcrumbs", url: "/Components/Breadcrumbs"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Buttons, "Buttons", url: "/Components/Buttons"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.ButtonGroups, "Button Groups", url: "/Components/ButtonGroups"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Cards, "Cards", url: "/Components/Cards"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Carousel, "Carousel", url: "/Components/Carousel"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Collapse, "Collapse", url: "/Components/Collapse"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Dropdowns, "Dropdowns", url: "/Components/Dropdowns"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.DynamicForms, "Dynamic Forms", url: "/Components/DynamicForms"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.FormElements, "Form Elements", url: "/Components/FormElements"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Grids, "Grids", url: "/Components/Grids"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.ListGroups, "List Groups", url: "/Components/ListGroup"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Modals, "Modals", url: "/Components/Modals"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Navbars, "Navbars", url: "/Components/Navs"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Paginator, "Paginator", url: "/Components/Paginator"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Popovers, "Popovers", url: "/Components/Popovers"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.ProgressBars, "Progress Bars", url: "/Components/ProgressBars"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Tables, "Tables", url: "/Components/Tables"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Tabs, "Tabs", url: "/Components/Tabs"),
new ApplicationMenuItem(BootstrapDemoMenus.Components.Tooltips, "Tooltips", url: "/Components/Tooltips")
};
items.OrderBy(x => x.Name)
.ToList()
.ForEach(x => menuItem.AddItem(x));
context.Menu.AddItem(menuItem);
context.Menu.AddItem(
new ApplicationMenuItem(
name: "Framework",
displayName: "Framework",
url: "https://abp.io"
)
);
context.Menu.AddItem(
new ApplicationMenuItem(
name: "Community",
displayName: "Community",
url: "https://community.abp.io"
)
);
context.Menu.AddItem(
new ApplicationMenuItem(
name: "Commercial",
displayName: "Commercial",
url: "https://commercial.abp.io"
)
);
context.Menu.AddItem(
new ApplicationMenuItem(
name: "Documents",
displayName: "Documents",
url: "https://Docs.abp.io"
)
);
context.Menu.AddItem(
new ApplicationMenuItem(
name: "Github",
displayName: "Github",
url: "https://github.com/abpframework/abp",
icon:"fa fa-github"
)
);
}
}

34
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Menus/BootstrapDemoMenus.cs

@ -0,0 +1,34 @@
namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Pages.Menus;
public class BootstrapDemoMenus
{
private const string Prefix = "BootstrapDemo";
public const string Home = Prefix + ".Home";
public static class Components
{
public const string Root = Prefix + ".Components";
public const string Alerts = Root + ".Alerts";
public const string Badges = Root + ".Badges";
public const string Borders = Root + ".Borders";
public const string Breadcrumbs = Root + ".Breadcrumbs";
public const string ButtonGroups = Root + ".ButtonGroups";
public const string Buttons = Root + ".Buttons";
public const string Cards = Root + ".Cards";
public const string Carousel = Root + ".Carousel";
public const string Collapse = Root + ".Collapse";
public const string Dropdowns = Root + ".Dropdowns";
public const string DynamicForms = Root + ".DynamicForms";
public const string FormElements = Root + ".FormElements";
public const string Grids = Root + ".Grids";
public const string ListGroups = Root + ".ListGroups";
public const string Modals = Root + ".Modals";
public const string Navbars = Root + ".Navbars";
public const string Paginator = Root + ".Paginator";
public const string Popovers = Root + ".Popovers";
public const string ProgressBars = Root + ".ProgressBars";
public const string Tables = Root + ".Tables";
public const string Tabs = Root + ".Tabs";
public const string Tooltips = Root + ".Tooltips";
}
}

3
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/_ViewStart.cshtml

@ -1,3 +0,0 @@
@{
Layout = "~/Pages/_Layout.cshtml";
}

BIN
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/imgs/demo/abp-io-light.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

10
modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/wwwroot/styles/my-global-styles.css

@ -0,0 +1,10 @@
.navbar-brand{
padding-right: 1em;
padding-top: 0.50em;
}
.navbar-brand img{
padding-right: 2em;
}
.nav-item{
padding-left: 2.2em;
}

8
npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts

@ -147,6 +147,8 @@ export class ErrorHandler {
this.navigateToLogin();
});
}
} if(err instanceof HttpErrorResponse && err.headers.get('Abp-Tenant-Resolve-Error')){
this.authService.logout().subscribe();
} else {
switch (err.status) {
case 401:
@ -176,7 +178,7 @@ export class ErrorHandler {
status: 403,
});
break;
case 404:
case 404:{
this.canCreateCustomError(404)
? this.show404Page()
: this.showError(
@ -189,7 +191,9 @@ export class ErrorHandler {
defaultValue: DEFAULT_ERROR_MESSAGES.defaultError404.title,
},
);
break;
break;
}
case 500:
this.createErrorComponent({
title: {

4
nupkg/pack.ps1

@ -24,8 +24,8 @@ foreach($project in $projects) {
Set-Location $projectFolder
#dotnet clean
dotnet pack -c Release --no-build
dotnet pack -c Release --no-build -- /maxcpucount
if (-Not $?) {
Write-Error "Packaging failed for the project: $projectName"
exit $LASTEXITCODE

Loading…
Cancel
Save