Commit Graph

310 Commits

Author SHA1 Message Date
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
36c26bc803 analizators/U2U1117 2022-01-18 15:40:28 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
9bc8584184 analizators/U2U1103 2022-01-13 15:53:57 +03:00
cacb889ee2 analizators/U2U1100 2022-01-13 15:04:28 +03:00
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
6961f38593 analizators/U2U1023 2022-01-12 15:34:58 +03:00
3ff7aeca3b analizators/U2U1015 2022-01-12 13:27:06 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +03:00
a671732da5 analizators/SCS0005 2022-01-10 12:24:21 +03:00
abd72b9e0d analizators/s3903 2021-12-29 18:49:02 +03:00
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
6cd3a7bfe1 analizators/s4201 2021-12-28 17:03:05 +03:00
fb3bfba1bd Files: optimization 2021-12-16 15:49:35 +03:00
043dd3d180 net6: bugfix encrypt 2021-11-26 13:53:06 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
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
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
8c7815d9a5
Merge pull request #427 from ONLYOFFICE/feature/sc
Feature/sc
2021-10-28 18:49:01 +03:00
40dc6a8e86 fix loading products 2021-10-28 16:07:14 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
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
498a896322 fix Bug 50254 2021-10-05 22:28:07 +03:00
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
dd9e5e9b5d Merge branch 'develop' into feature/webhooks 2021-08-26 15:17:53 +03:00
b791586252 net6 2021-08-25 18:26:13 +03:00
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
9f83801f88 Nlog: optimization 2021-08-20 15:42:43 +03:00
b23fe977cb Kafka: fix 2021-08-13 17:05:11 +03:00
86248a3ad1 Kafka: fix create topic 2021-08-13 11:09:01 +03:00
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
2021-08-12 15:00:53 +03:00
fff54bd9dc Kafka: create before assign 2021-08-11 21:15:37 +03:00
57493d1018 Logger: singletone 2021-08-10 17:56:59 +03:00
672de09a90 NLog: up to 4.7.10 2021-08-08 15:55:27 +03:00
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
a0b34c5cc9 Webhook: fix 2021-07-31 20:12:41 +03:00
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
d821f9a2af TimeZone: fix 2021-07-22 22:40:37 +03:00
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
2021-06-16 17:02:46 +03:00
73547f421e Common: install newtonsoft 2021-06-15 16:44:53 +03:00
b925943cb6 merge from develop 2021-06-07 17:23:25 +03:00
76d8ebb459 Tests moved to separate projects.
Removed unused dependepcies
2021-06-01 12:21:51 +03:00
2018820472 Merge branch 'develop' into feature/crm-migrate 2021-05-31 19:37:51 +03:00
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
c1b7ea5a9a Storage: moved from 08a01422 2021-05-21 16:26:42 +03:00