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

370 Commits

Author SHA1 Message Date
pavelbannov
944966b67b WebSocker: repair service 2021-06-03 16:13:22 +03:00
pavelbannov
43de25b62a Merge branch 'develop' into feature/remove-unused-dep 
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
 2021-06-03 12:52:21 +03:00
Pavel Bannov
ceb19659f3
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks 
Feature/thirdparty for two frameworks
 2021-06-03 12:19:27 +03:00
pavelbannov
e9c5ca41ae fix 2021-06-02 11:26:58 +03:00
SuhorukovAnton
7fd550dfe8 Merge branch 'develop' into feature/thirdparty_for_two_frameworks 2021-06-01 17:49:10 +03:00
pavelbannov
76d8ebb459 Tests moved to separate projects. 
Removed unused dependepcies
 2021-06-01 12:21:51 +03:00
pavelbannov
d3fb9f8384 fix 2021-05-31 14:08:13 +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
0be4e07865 SsoAuth: 2e37dcd0 2021-05-31 11:35:42 +03:00
pavelbannov
527a650601 WebStudio: resources 2021-05-27 21:30:15 +03:00
pavelbannov
bda786f844 WebStudio: moved from 08a01422 2021-05-27 20:13:24 +03:00
pavelbannov
f6fbe33814 Web.Core: moved from 08a01422 2021-05-24 20:41:31 +03:00
pavelbannov
90c67cac13 ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422 2021-05-24 13:26:13 +03:00
pavelbannov
1b730233c9 ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
pavelbannov
c1b7ea5a9a Storage: moved from 08a01422 2021-05-21 16:26:42 +03:00
SuhorukovAnton
02da2a15d1 websocket for only net standart 2021-05-21 13:31:28 +03:00
pavelbannov
5d94113e23 Backup: fix 2021-05-19 11:31:50 +03:00
pavelbannov
8a3db93d0d Backup: moved from 08a01422 2021-05-17 21:27:39 +03:00
pavelbannov
a5c6ba5dcc Common, db: moved from 08a01422 2021-05-17 14:35:00 +03:00
pavelbannov
d01db1eed6 Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq 
# Conflicts:
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
#	common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/services/ASC.Data.Backup/BackupAjaxHandler.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2021-05-13 11:57:40 +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
0c7cbb6c99 removed unused newtonsoft.json 2021-05-06 12:20:37 +03:00
Alexey Bannov
0dbadc6394 from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
Alexey Bannov
2d8b085d02 add support WindowsService/systemd for IHostBuilder 
listen unix socket if it setup for Kestrel Web Server
 2021-04-23 16:54:39 +03:00
Alexey Bannov
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
Alexey Bannov
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +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
f0e227731f Fixed loading products, lazy loading webitemmanager 2021-01-26 12:29:50 +03:00
pavelbannov
f8be896241 Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
 2021-01-22 16:34:40 +03:00
pavelbannov
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +03:00
pavelbannov
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
pavelbannov
fa7c2bf9f1 Merge branch 'develop' into feature/asc-files-tests 2020-12-29 18:37:28 +03:00
pavelbannov
0ae7f84de6 SocketIO: fix 2020-12-28 16:47:59 +03:00
pavelbannov
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
pavelbannov
1675896294 Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
 2020-12-04 11:59:10 +03:00
pavelbannov
40546da35d fix create file 2020-11-26 20:30:57 +03:00
pavelbannov
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
pavelbannov
71b6f71fd7 Files: fix dispose 2020-11-20 15:49:57 +03:00
pavelbannov
1623241d8a Code cleanup 2020-11-17 13:00:01 +03:00
pavelbannov
75fce656f0 Merge branch 'develop' into feature/dotnet5 2020-11-17 11:31:14 +03:00
pavelbannov
a66f99f574 net5.0 2020-11-15 18:55:57 +03:00
pavelbannov
68483bc979 Merge branch 'develop' into refactoring/scope 
# Conflicts:
#	common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Startup.cs
 2020-11-13 16:03:17 +03:00
SuhorukovAnton
44e565ca37 x-www-form-urlencoded: add models 2020-11-10 13:41:32 +03:00
SuhorukovAnton
855c5bc92b x-www-form-urlencoded: first version 2020-11-06 12:03:49 +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
790d2fc934 Restore: fix 2020-11-03 16:02:54 +03:00
pavelbannov
450184f51c Merge branch 'develop' into feature/connect-controlPanel 2020-11-03 11:48:52 +03:00
pavelbannov
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
pavelbannov
c9a32c05dc Merge branch 'develop' into feature/connect-controlPanel 
# Conflicts:
#	web/ASC.Web.Api/Controllers/PortalController.cs
 2020-11-02 13:56:52 +03:00
pavelbannov
4056ea888a Notify: fix urls 2020-10-30 17:57:31 +03:00