IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,405 Commits 40 Branches 22 Tags 420 MiB
1ef4b32939
Commit Graph

129 Commits

Author SHA1 Message Date
pavelbannov
9f5a1f3ba7 Merge branch 'develop' into feature/analizators 2022-02-07 19:28:23 +03:00
Alexey Bannov
eed733b83c fixed user photo thumbnail generator 2022-02-04 20:59:58 +03:00
SuhorukovAnton
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
SuhorukovAnton
fce8d26cef analizators/ca1507 2022-01-24 13:49:00 +03:00
SuhorukovAnton
667697f933 analizators/s2259 2022-01-21 16:46:30 +03:00
SuhorukovAnton
510bd4d731 analizators/s2219 2022-01-21 16:42:02 +03:00
SuhorukovAnton
3d635a4824 analizators/1643 2022-01-21 16:12:05 +03:00
SuhorukovAnton
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
SuhorukovAnton
728c1b896e analizators/s1104 2022-01-21 12:19:57 +03:00
SuhorukovAnton
bf3b0395a5 analizators/s1116 2022-01-21 11:04:08 +03:00
SuhorukovAnton
20b60958a8 analizators/U2U1022 2022-01-19 13:24:11 +03:00
SuhorukovAnton
1403afbc16 analizators/U2U1209 2022-01-19 11:59:14 +03:00
SuhorukovAnton
b9884e6b81 Analizators/U2U1107 2022-01-14 16:32:06 +03:00
SuhorukovAnton
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
SuhorukovAnton
9bc8584184 analizators/U2U1103 2022-01-13 15:53:57 +03:00
Alexey Bannov
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
SuhorukovAnton
a671732da5 analizators/SCS0005 2022-01-10 12:24:21 +03:00
Alexey Bannov
a7dc8c7dfd sync CommunityServer and AppServer cache via redis 2021-12-30 18:09:20 +03:00
SuhorukovAnton
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
SuhorukovAnton
5e91416c53 analizators/s4035 2021-12-28 18:44:54 +03:00
Alexey Bannov
eb02c96697 microsoft recomended store the System.Guid type as string type in protobuf format 2021-12-23 18:29:35 +03:00
pavelbannov
58d84912dd fix 2021-11-25 11:23:35 +03:00
SuhorukovAnton
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
SuhorukovAnton
b6461e46f4 net6: replacing System.Drawing with ImageSharp 2021-10-18 14:24:05 +03:00
pavelbannov
c37fd46e6f fix remove photo 2021-08-25 21:17:06 +03:00
pavelbannov
637be57e84 People: resize fix 2021-06-11 14:48:49 +03:00
pavelbannov
570ede7bba Merge branch 'develop' into feature/11.5.2 
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2021-05-31 13:32:51 +03:00
pavelbannov
90c67cac13 ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422 2021-05-24 13:26:13 +03:00
pavelbannov
b9c52c526e Fixed DistributedTask 2021-05-18 21:24:22 +03:00
pavelbannov
6867ded281 Merge branch 'develop' into feature/remove-wq 
# Conflicts:
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
 2021-05-13 11:23:44 +03:00
pavelbannov
2f38b2ec33 Settings: fixed custom schemaName 2021-04-14 21:08:27 +03:00
pavelbannov
038fd58d7c Settings: fixed custom schemaName 2021-04-14 16:21:37 +03:00
pavelbannov
18a2c0a53d Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
 2021-03-25 21:50:09 +03:00
pavelbannov
bc30b1311e Auth by thirdparty 2021-02-19 19:16:08 +03:00
pavelbannov
7da0b78e48 CustomingNamingPeople: fix 2021-02-16 21:45:17 +03:00
pavelbannov
1623241d8a Code cleanup 2020-11-17 13:00:01 +03:00
pavelbannov
79ea471098 Merge branch 'develop' into refactoring/scope 
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
 2020-11-04 15:22:43 +03:00
pavelbannov
b0b4f91eac CustomNamingPeople: fix 2020-11-02 13:35:08 +03:00
pavelbannov
6f25e2e83e Refacoring: scope 2020-10-21 14:12:08 +03:00
pavelbannov
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +03:00
pavelbannov
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
pavelbannov
b1d50e5702 Core: fix DI 2020-10-13 11:26:17 +03:00
pavelbannov
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
pavelbannov
36034bf97a fix warnings 2020-10-12 16:52:31 +03:00
SuhorukovAnton
edbc0f247c fix-messages: IDE0022 2020-09-30 17:47:42 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
pavelbannov
90e61ba082 Added DistributedTaskProgress 2020-09-30 13:54:49 +03:00
pavelbannov
e4d4db6563 Merge branch 'master' into feature/remove-wq 
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressBase.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
 2020-09-29 19:46:40 +03:00
SuhorukovAnton
9b6ccc19f0 fix-messages: IDE0074 2020-09-29 14:51:34 +03:00
SuhorukovAnton
a055c71610 fix-messages: IDE0070 2020-09-29 14:32:30 +03:00