Commit Graph

224 Commits

Author SHA1 Message Date
04ccfb2caa Webhooks: fix empty result 2021-12-14 15:51:03 +03:00
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +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
8cc08045b7 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
2021-11-01 13:54:40 +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
a69df29e7d Services: fix httpContextAccessor 2021-10-28 13:23:26 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
403388fbf1 Added solution filter
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
ed8487e99f Webhook: format 2021-10-19 19:53:28 +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
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
0f833ae1de net6: warning SYSLIB0020 2021-10-01 13:26:36 +03:00
24224a7437 Files: fix rename folders. fix favorites 2021-09-30 21:26:01 +03:00
d27160cf98 Fix mobile app requests 2021-09-28 14:41:35 +03:00
90bb2ef44a fixed bearer 2021-09-24 12:08:10 +03:00
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
2e20b4958d fix CookieAuthHandler 2021-09-08 13:16:58 +03:00
51d905abc6 Cookie: logout after failed auth 2021-09-07 22:58:01 +03:00
Vashchuk Nikita
3b4cb1dfc6 Added GlobalFilter, fix 2021-09-03 17:02:52 +03:00
Vashchuk Nikita
45d221a109 Split webhooks into service and core 2021-08-26 21:43:41 +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
c851641b6c Merge remote-tracking branch 'remotes/origin/feature/webhooks' into feature/webhooks 2021-08-23 13:01:48 +03:00
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
610e31ec3b fixed equals 2021-08-20 19:04:55 +03:00
Vashchuk Nikita
e1c648e06a Merge branch 'develop' into feature/webhooks 2021-08-19 13:49:16 +03:00
Vashchuk Nikita
7d4b22ca83 added tests, migrations 2021-08-19 12:11:26 +03:00
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
16469eb138 Api: added ConfigureNLogLogging 2021-08-08 15:56:54 +03:00
672de09a90 NLog: up to 4.7.10 2021-08-08 15:55:27 +03:00
Vashchuk Nikita
b70c2e6f09 fix 2021-08-03 19:26:28 +03:00
a0b34c5cc9 Webhook: fix 2021-07-31 20:12:41 +03:00
Vashchuk Nikita
3c8fadc28d modified WebhooksMiddleware 2021-07-29 15:39:22 +03:00
Vashchuk Nikita
b913cdc813 Added WebhooksIdentifier.cs 2021-07-28 18:16:56 +03:00
Vashchuk Nikita
afdd1ab982 Added CustomMiddleware(WebhooksMiddleware.cs) 2021-07-28 13:10:14 +03:00
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
1268a436ca Startup: fix load products 2021-07-16 11:56:14 +03:00
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
7e6e25274f Api: fix confirm 2021-07-10 20:27:15 +03:00
a23b23de3c Startup: added ability to skip load products and consumers 2021-06-24 11:15:20 +03:00
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
3788bab48e HealthCheck: fix Studio 2021-06-22 19:55:47 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
2021-06-16 17:02:46 +03:00
5fcbdbd7dd added health checks 2021-06-16 16:54:36 +03:00