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

302 Commits

Author SHA1 Message Date
pavelbannov
7b0707ba16 Merge branch 'develop' into feature/async 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
 2021-12-17 10:48:44 +03:00
pavelbannov
fb3bfba1bd Files: optimization 2021-12-16 15:49:35 +03:00
pavelbannov
d181d43b36 Merge branch 'develop' into feature/async 
# Conflicts:
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/ASC.Files.csproj
 2021-12-02 12:02:50 +03:00
SuhorukovAnton
043dd3d180 net6: bugfix encrypt 2021-11-26 13:53:06 +03:00
pavelbannov
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
pavelbannov
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
pavelbannov
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
pavelbannov
8ca88e4620 Merge branch 'develop' into feature/net6 
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
 2021-11-23 16:40:50 +03:00
Vashchuk Nikita
35ceaf7997 Merge branch 'develop' into feature/async 2021-11-22 11:30:38 +03:00
Vashchuk Nikita
43e2a65081 Spreading async in Files 2021-11-15 14:31:47 +03:00
pavelbannov
26511d9fb7 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Tests.sln
 2021-10-29 13:18:57 +03:00
Alexey Bannov
8c7815d9a5
Merge pull request #427 from ONLYOFFICE/feature/sc 
Feature/sc
 2021-10-28 18:49:01 +03:00
pavelbannov
40dc6a8e86 fix loading products 2021-10-28 16:07:14 +03:00
Alexey Bannov
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
SuhorukovAnton
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
Vashchuk Nikita
4ef5b4c8e5 Added async in Asc.Files.Core(Dao) 2021-10-21 20:59:05 +03:00
pavelbannov
5a5e299d98 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
 2021-10-19 18:30:59 +03:00
pavelbannov
498a896322 fix Bug 50254 2021-10-05 22:28:07 +03:00
pavelbannov
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
pavelbannov
dd9e5e9b5d Merge branch 'develop' into feature/webhooks 2021-08-26 15:17:53 +03:00
pavelbannov
b791586252 net6 2021-08-25 18:26:13 +03:00
pavelbannov
a0f5c4231f fixed run via vs 2021-08-23 15:55:19 +03:00
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
pavelbannov
9f83801f88 Nlog: optimization 2021-08-20 15:42:43 +03:00
pavelbannov
b23fe977cb Kafka: fix 2021-08-13 17:05:11 +03:00
pavelbannov
86248a3ad1 Kafka: fix create topic 2021-08-13 11:09:01 +03:00
Alexey Bannov
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log 
Feature/log
 2021-08-12 15:00:53 +03:00
pavelbannov
fff54bd9dc Kafka: create before assign 2021-08-11 21:15:37 +03:00
pavelbannov
57493d1018 Logger: singletone 2021-08-10 17:56:59 +03:00
pavelbannov
672de09a90 NLog: up to 4.7.10 2021-08-08 15:55:27 +03:00
Alexey Bannov
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
pavelbannov
a0b34c5cc9 Webhook: fix 2021-07-31 20:12:41 +03:00
NikolayRechkin
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
pavelbannov
d821f9a2af TimeZone: fix 2021-07-22 22:40:37 +03:00
pavelbannov
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
Alexey Bannov
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate 
Feature/crm migrate
 2021-06-16 17:02:46 +03:00
pavelbannov
73547f421e Common: install newtonsoft 2021-06-15 16:44:53 +03:00
Alexey Bannov
b925943cb6 merge from develop 2021-06-07 17:23:25 +03:00
pavelbannov
76d8ebb459 Tests moved to separate projects. 
Removed unused dependepcies
 2021-06-01 12:21:51 +03:00
Alexey Bannov
2018820472 Merge branch 'develop' into feature/crm-migrate 2021-05-31 19:37:51 +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
c1b7ea5a9a Storage: moved from 08a01422 2021-05-21 16:26:42 +03:00
pavelbannov
5d94113e23 Backup: fix 2021-05-19 11:31:50 +03:00
pavelbannov
b9c52c526e Fixed DistributedTask 2021-05-18 21:24:22 +03:00
Alexey Bannov
4b4b03f2a4 Merge branch 'develop' into feature/crm-migrate 2021-05-18 19:06:54 +03:00
Vashchuk Nikita
82abf11109 Merge branch 'develop' into feature/calendar 
# Conflicts:
#	ASC.Web.sln
#	config/autofac.products.json
#	config/nginx/onlyoffice.conf
#	products/ASC.Calendar/Server/ASC.Calendar.csproj
#	products/ASC.Calendar/Server/Controllers/CalendarController.cs
#	products/ASC.Calendar/Server/Program.cs
#	products/ASC.Calendar/Server/Properties/launchSettings.json
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
#	products/ASC.Calendar/Server/Startup.cs
 2021-05-18 13:24:02 +03:00
Vashchuk Nikita
94047ab0a1 Fix Calendar 2021-05-17 21:35:23 +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