Merge branch 'master' into netcore3.0

ismcagdas · ismcagdas · commit 0d1922280042 · 2019-10-28T12:11:50.000+03:00
diff --git a/angular/src/app/layout/sidebar-user-area.component.html b/angular/src/app/layout/sidebar-user-area.component.html
@@ -8,7 +8,7 @@
         <div class="btn-group user-helper-dropdown">
             <i class="material-icons" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">keyboard_arrow_down</i>
             <ul class="dropdown-menu pull-right">
-                <li><a [routerLink]="['/app/update-password']"><i class="material-icons">lock</i>Update Password</a></li>
+                <li><a [routerLink]="['/app/update-password']"><i class="material-icons">lock</i>{{ 'UpdatePassword' | localize }}</a></li>
                 <li><a (click)="logout()"><i class="material-icons">input</i>{{ 'Logout' | localize }}</a></li>
             </ul>
         </div>
diff --git a/angular/src/app/users/change-password/change-password.component.html b/angular/src/app/users/change-password/change-password.component.html
@@ -11,7 +11,7 @@ <h2>{{ "UpdatePassword" | localize }}</h2>
                             <div class="col-md-6">
                                 <mat-form-field>
                                     <input matInput id="currentPassword" type="password" name="CurrentPassword" formControlName="currentPassword"
-                                        [placeholder]="'Current Password' | localize"
+                                        [placeholder]="'CurrentPassword' | localize"
                                         required minlength="2" maxlength="32"
                                         />
                                 </mat-form-field>
@@ -21,11 +21,11 @@ <h2>{{ "UpdatePassword" | localize }}</h2>
                             <div class="col-md-6" [formGroup]="passwordsFormGroup" formGroupName="passwords">
                                 <mat-form-field>
                                     <input matInput id="newPassword" formControlName="newPassword" type="password" name="NewPassword" 
-                                        [placeholder]="'New Password' | localize"
+                                        [placeholder]="'NewPassword' | localize"
                                         required minlength="2" maxlength="32"
                                         />
                                     <mat-error *ngIf="passwordsFormGroup.controls.newPassword.errors">
-                                        Passwords must be at least 8 characters, contain a lowercase, uppercase, and number
+                                        {{ "PasswordsMustBeAtLeast8CharactersContainLowercaseUppercaseNumber" | localize }}
                                     </mat-error>
                                 </mat-form-field>
                             </div>
@@ -34,14 +34,14 @@ <h2>{{ "UpdatePassword" | localize }}</h2>
                             <div class="col-md-6" formGroupName="passwords">
                                 <mat-form-field>
                                     <input matInput id="repeatNewPassword" formControlName="repeatNewPassword" type="password" name="RepeatNewPassword" 
-                                        [placeholder]="'Confirm New Password' | localize" [errorStateMatcher]="equalMatcher"
+                                        [placeholder]="'ConfirmNewPassword' | localize" [errorStateMatcher]="equalMatcher"
                                         required minlength="2" maxlength="32"
                                         />
                                     <mat-error *ngIf="passwordsFormGroup.errors &&
                                         passwordsFormGroup.errors.areEqual &&
                                         passwordsFormGroup.controls.newPassword.touched
                                         ">
-                                        Passwords do not match
+                                        {{ "PasswordsDoNotMatch" | localize }}
                                     </mat-error>
                                 </mat-form-field>
                             </div>
diff --git a/angular/src/app/users/users.component.html b/angular/src/app/users/users.component.html
@@ -92,7 +92,7 @@ <h2>{{ "Users" | localize }}</h2>
                                     </button>
                                     <button mat-menu-item (click)="resetPassword(user)">
                                         <mat-icon>lock</mat-icon>
-                                        <span>{{ "Reset Password" | localize }}</span>
+                                        <span>{{ "ResetPassword" | localize }}</span>
                                     </button>
                                 </mat-menu>
                             </td>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-pt-BR.xml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-pt-BR.xml
@@ -91,5 +91,15 @@
     <text name="StartTyping">Comece a escrever</text>
     <text name="Skins">Temas</text>
     <text name="Settings">Configurações</text>
+    <text name="Search">Procurar</text>
+    <text name="UpdatePassword">Alterar Senha</text>
+    <text name="ResetPassword">Resetar Senha</text>
+    <text name="Filter">Filtrar</text>
+    <text name="All">Todos</text>
+    <text name="CurrentPassword">Senha Atual</text>
+    <text name="NewPassword">Nova Senha</text>
+    <text name="ConfirmNewPassword">Confirme a Nova Senha</text>
+    <text name="PasswordsDoNotMatch">As senhas são diferentes</text>
+    <text name="PasswordsMustBeAtLeast8CharactersContainLowercaseUppercaseNumber">As senhas precisam ter no mínimo 8 caracteres, contendo pelo menos uma letra minúscula, uma maiúscula e um número</text>
   </texts>
 </localizationDictionary>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml
@@ -95,6 +95,11 @@
     <text name="Skins">Skins</text>
     <text name="Settings">Settings</text>
     <text name="Filter">Filter</text>
+    <text name="CurrentPassword">Current Password</text>
+    <text name="NewPassword">New Password</text>
+    <text name="ConfirmNewPassword">Confirm New Password</text>
+    <text name="PasswordsDoNotMatch">Passwords do not match</text>
+    <text name="PasswordsMustBeAtLeast8CharactersContainLowercaseUppercaseNumber">Passwords must be at least 8 characters, contain a lowercase, uppercase, and number</text>
     <text name="UserDeleteWarningMessage">User {0} will be deleted.</text>
     <text name="RoleDeleteWarningMessage">Role {0} will be deleted and unassigned from all assigned users.</text>
     <text name="TenantDeleteWarningMessage">Tenant {0} will be deleted.</text>
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Dockerfile b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore:2.0.1
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-stretch-slim
 
 WORKDIR /app
 COPY . .
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Dockerfile b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/aspnetcore:2.0.1
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-stretch-slim
 
 WORKDIR /app
 COPY . .
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Roles/Index.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Roles/Index.js
@@ -26,7 +26,7 @@
 			abp.ajax({
 				url: abp.appPath + 'Roles/EditRoleModal?roleId=' + roleId,
 				type: 'POST',
-				contentType: 'application/html',
+				dataType: 'html',
 				success: function (content) {
 					$('#RoleEditModal div.modal-content').html(content);
 				},
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/Components/TenantChange/Default.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/Components/TenantChange/Default.js
@@ -5,7 +5,7 @@
             abp.ajax({
                 url: abp.appPath + 'Account/TenantChangeModal',
                 type: 'POST',
-                contentType: 'application/html',
+                dataType: 'html',
                 success: function (content) {
                     $('#TenantChangeModal div.modal-content').html(content);
                 },
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Tenants/Index.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Tenants/Index.js
@@ -25,7 +25,7 @@
             abp.ajax({
                 url: abp.appPath + 'Tenants/EditTenantModal?tenantId=' + tenantId,
                 type: 'POST',
-                contentType: 'application/html',
+                dataType: 'html',
                 success: function (content) {
                     $('#TenantEditModal div.modal-content').html(content);
                 },
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Users/Index.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Users/Index.js
@@ -32,7 +32,7 @@
             abp.ajax({
                 url: abp.appPath + 'Users/EditUserModal?userId=' + userId,
                 type: 'POST',
-                contentType: 'application/html',
+                dataType: 'html',
                 success: function (content) {
                     $('#UserEditModal div.modal-content').html(content);
                 },
diff --git a/reactjs/craco.config.js b/reactjs/craco.config.js
@@ -41,6 +41,7 @@ module.exports = {
               },
               {
                 from: 'node_modules/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr-client.js',
+                to:'dist/abp.signalr-client.js'
               },
               {
                 from: 'src/lib/abp.js',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM microsoft/aspnetcore:2.0.1`
	`1`	`+FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-stretch-slim`
`2`	`2`
`3`	`3`	`WORKDIR /app`
`4`	`4`	`COPY . .`