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

abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json

@@ -5,8 +5,9 @@
     "OrganizationList": "Organization list",
     "Volo.AbpIo.Commercial:010003": "You are not owner of this organization!",
     "OrganizationNotFoundMessage": "No organization found!",
-    "DeveloperCount": "Developer count",
-    "QuestionCount": "Question count",
+    "DeveloperCount": "Allocated / total developers",
+    "QuestionCount": "Remaining / total questions",
+    "Unlimited": "Unlimited", 
     "Owners": "Owners",
     "AddMember": "Add member",
     "AddOwner": "Add owner",
@@ -30,5 +31,5 @@
     "SuccessfullyAddedToNewsletter": "Thanks you for subscribing to our newsletter!",
     "ManageProfile": "Manage your profile",
     "EmailNotValid": "Please enter a valid email address."
-  }
+   }
 }

framework/src/Volo.Abp.Authorization/Microsoft/Extensions/DependencyInjection/AbpAuthorizationServiceCollectionExtensions.cs

@@ -11,6 +11,7 @@ namespace Microsoft.Extensions.DependencyInjection
         {
             services.Replace(ServiceDescriptor.Singleton<IAuthorizationService, AlwaysAllowAuthorizationService>());
             services.Replace(ServiceDescriptor.Singleton<IAbpAuthorizationService, AlwaysAllowAuthorizationService>());
+            services.Replace(ServiceDescriptor.Singleton<IMethodInvocationAuthorizationService, AlwaysAllowMethodInvocationAuthorizationService>());
             return services.Replace(ServiceDescriptor.Singleton<IPermissionChecker, AlwaysAllowPermissionChecker>());
         }
     }

framework/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AlwaysAllowMethodInvocationAuthorizationService.cs

@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+
+namespace Volo.Abp.Authorization
+{
+    public class AlwaysAllowMethodInvocationAuthorizationService : IMethodInvocationAuthorizationService
+    {
+        public Task CheckAsync(MethodInvocationAuthorizationContext context)
+        {
+            return Task.CompletedTask;
+        }
+    }
+}

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedAggregateRootWithUser.cs

@@ -9,7 +9,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
     /// <typeparam name="TUser">Type of the user</typeparam>
     [Serializable]
     public abstract class AuditedAggregateRootWithUser<TUser> : AuditedAggregateRoot, IAuditedObject<TUser>
-        where TUser : IEntity<long>
+        where TUser : IEntity<Guid>
     {
         /// <inheritdoc />
         public virtual TUser Creator { get; set; }
@@ -25,7 +25,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
     /// <typeparam name="TUser">Type of the user</typeparam>
     [Serializable]
     public abstract class AuditedAggregateRootWithUser<TKey, TUser> : AuditedAggregateRoot<TKey>, IAuditedObject<TUser>
-        where TUser : IEntity<long>
+        where TUser : IEntity<Guid>
     {
         /// <inheritdoc />
         public virtual TUser Creator { get; set; }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/AuditedEntityWithUser.cs

@@ -9,7 +9,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
     /// <typeparam name="TUser">Type of the user</typeparam>
     [Serializable]
     public abstract class AuditedEntityWithUser<TUser> : AuditedEntity, IAuditedObject<TUser>
-        where TUser : IEntity<long>
+        where TUser : IEntity<Guid>
     {
         /// <inheritdoc />
         public virtual TUser Creator { get; set; }
@@ -25,7 +25,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
     /// <typeparam name="TUser">Type of the user</typeparam>
     [Serializable]
     public abstract class AuditedEntityWithUser<TKey, TUser> : AuditedEntity<TKey>, IAuditedObject<TUser>
-        where TUser : IEntity<long>
+        where TUser : IEntity<Guid>
     {
         /// <inheritdoc />
         public virtual TUser Creator { get; set; }

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Auditing/FullAuditedEntityWithUser.cs

@@ -9,7 +9,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
     /// <typeparam name="TUser">Type of the user</typeparam>
     [Serializable]
     public abstract class FullAuditedEntityWithUser<TUser> : FullAuditedEntity, IFullAuditedObject<TUser>
-        where TUser : IEntity<long>
+        where TUser : IEntity<Guid>
     {
         /// <inheritdoc />
         public virtual TUser Deleter { get; set; }
@@ -28,7 +28,7 @@ namespace Volo.Abp.Domain.Entities.Auditing
     /// <typeparam name="TUser">Type of the user</typeparam>
     [Serializable]
     public abstract class FullAuditedEntityWithUser<TKey, TUser> : FullAuditedEntity<TKey>, IFullAuditedObject<TUser>
-        where TUser : IEntity<long>
+        where TUser : IEntity<Guid>
     {
         /// <inheritdoc />
         public virtual TUser Deleter { get; set; }

modules/users/src/Volo.Abp.Users.Domain/Volo/Abp/Users/UserLookupService.cs

@@ -149,4 +149,4 @@ namespace Volo.Abp.Users
             }
         }
     }
-}
+}