Skip to content

Commit ed5b7ac

Browse files
author
Musa Demir
committed
Merge branch 'master' into pr/489
1 parent 6935567 commit ed5b7ac

File tree

68 files changed

+12879
-21183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+12879
-21183
lines changed

‎angular/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
"@types/moment": "^2.13.0",
3434
"@types/moment-timezone": "^0.5.12",
3535
"@types/toastr": "^2.1.33",
36-
"abp-ng2-module": "^4.0.0",
37-
"abp-web-resources": "^3.8.2",
36+
"abp-ng2-module": "^5.1.1",
37+
"abp-web-resources": "^5.1.1",
3838
"animate.css": "^3.5.2",
3939
"block-ui": "^2.70.1",
4040
"bootstrap": "^3.3.7",
@@ -60,14 +60,14 @@
6060
"node-waves": "^0.7.5",
6161
"push.js": "1.0.9",
6262
"raphael": "^2.2.7",
63-
"rxjs": "^6.2.0",
63+
"rxjs": "^6.4.0",
6464
"simple-line-icons": "^2.4.1",
6565
"spin.js": "^2.3.2",
6666
"sweetalert": "^2.0.8",
6767
"toastr": "^2.1.2",
6868
"ts-helpers": "^1.1.2",
6969
"web-animations-js": "^2.3.2",
70-
"zone.js": "~0.10.2"
70+
"zone.js": "~0.9.1"
7171
},
7272
"devDependencies": {
7373
"@angular-devkit/build-angular": "~0.803.2",

‎angular/src/account/account.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<div class="row">
1515
<div class="col-xs-12 text-center" style="color: #e9e9e9">
16-
<small>&copy; {{currentYear}} AbpProjectName. <b>Version </b> {{versionText}}</small>
16+
<small>&copy; {{currentYear}} AbpProjectName. <b>{{ "Version" | localize }} </b> {{versionText}}</small>
1717
</div>
1818
</div>
1919

‎angular/src/app/layout/sidebar-footer.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
&copy; {{currentYear}} <a href="javascript:void(0);">AbpProjectName</a>.
44
</div>
55
<div class="version">
6-
<b>Version </b> {{versionText}}
6+
<b>{{ "Version" | localize }} </b> {{versionText}}
77
</div>
88
</div>

‎angular/src/app/roles/roles.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ export class RolesComponent extends PagedListingComponentBase<RoleDto> {
6666
delete(role: RoleDto): void {
6767
abp.message.confirm(
6868
this.l('RoleDeleteWarningMessage', role.displayName),
69+
undefined,
6970
(result: boolean) => {
7071
if (result) {
7172
this._rolesService

‎angular/src/app/tenants/tenants.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ export class TenantsComponent extends PagedListingComponentBase<TenantDto> {
6767
delete(tenant: TenantDto): void {
6868
abp.message.confirm(
6969
this.l('TenantDeleteWarningMessage', tenant.name),
70+
undefined,
7071
(result: boolean) => {
7172
if (result) {
7273
this._tenantService

‎angular/src/app/users/users.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ export class UsersComponent extends PagedListingComponentBase<UserDto> {
7575
protected delete(user: UserDto): void {
7676
abp.message.confirm(
7777
this.l('UserDeleteWarningMessage', user.fullName),
78+
undefined,
7879
(result: boolean) => {
7980
if (result) {
8081
this._userService.delete(user.id).subscribe(() => {

‎angular/yarn.lock

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,14 +1245,15 @@ abbrev@1:
12451245
version "1.1.1"
12461246
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
12471247

1248-
abp-ng2-module@^4.0.0:
1249-
version "4.0.0"
1250-
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-4.0.0.tgz#de1d952ce91847dc58ac2929654fee2a6c7a4525"
1251-
integrity sha512-k/KjkAWrNz2Cg2c5IQtEKdKDQA3LGW7nncJneeUz+Hl0KrV+sOi9c2LnaOL0Q7q0hCfUPhO9GkEUrQGpF7c5gQ==
1248+
abp-ng2-module@^5.1.1:
1249+
version "5.1.1"
1250+
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-5.1.1.tgz#a3e673656c3081e21b5dfa679f138d79ebbfc55e"
1251+
integrity sha512-eYtmjQegvjxd7qSYlotqPKbNnJQtFljUXElrpzC85EoVb8wPM2f9SOJcQ0FcgW8w8BXqdipg7YdiujM3bv/LTw==
12521252

1253-
abp-web-resources@^3.8.2:
1254-
version "3.8.2"
1255-
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.8.2.tgz#b7768eb0757cff0266fd3c4e789af81e15c9dc96"
1253+
abp-web-resources@^5.1.1:
1254+
version "5.1.1"
1255+
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-5.1.1.tgz#3db1324179e3f28566f84f02c43fe9f3776bb81c"
1256+
integrity sha512-/ueU9++2ZGkjGe/oqdOA2rTEQbCkteZAputaP3Mcr2uvBWTJCvII/R7mgeCAC2x90qpH+WSiIBD6nNpgaSqTZA==
12561257

12571258
accepts@~1.3.4, accepts@~1.3.5:
12581259
version "1.3.5"
@@ -6590,12 +6591,6 @@ [email protected]:
65906591
dependencies:
65916592
tslib "^1.9.0"
65926593

6593-
rxjs@^6.2.0:
6594-
version "6.2.1"
6595-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz#246cebec189a6cbc143a3ef9f62d6f4c91813ca1"
6596-
dependencies:
6597-
tslib "^1.9.0"
6598-
65996594
rxjs@^6.4.0:
66006595
version "6.5.2"
66016596
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
@@ -8256,7 +8251,7 @@ yn@^3.0.0:
82568251
resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
82578252
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
82588253

8259-
zone.js@~0.10.2:
8260-
version "0.10.2"
8261-
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.2.tgz#67ca084b3116fc33fc40435e0d5ea40a207e392e"
8262-
integrity sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg==
8254+
zone.js@~0.9.1:
8255+
version "0.9.1"
8256+
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
8257+
integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Application</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Application</PackageId>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<VersionPrefix>1.0.0.0</VersionPrefix>
5-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
66
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
77
<AssemblyName>AbpCompanyName.AbpProjectName.Core</AssemblyName>
88
<PackageId>AbpCompanyName.AbpProjectName.Core</PackageId>
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.AutoMapper" Version="5.0.0" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="5.0.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="5.1.0" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="5.1.0" />
2323
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
2424
</ItemGroup>
2525

‎aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
55
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
66
<RootNamespace>AbpCompanyName.AbpProjectName</RootNamespace>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -16,12 +16,12 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
2121
<PrivateAssets>all</PrivateAssets>
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2323
</PackageReference>
24-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0">
24+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>

0 commit comments

Comments
 (0)