Commit Graph

1344 Commits

Author SHA1 Message Date
8f53895e3d analizators/s2201 2021-12-30 14:03:05 +03:00
3d33fecf77 analizators/s2259 2021-12-30 14:00:03 +03:00
555ca30c99 analizators/s2259 2021-12-30 13:23:01 +03:00
e2857e87f5 analizators/s2997 2021-12-30 12:52:44 +03:00
2a82bc884e analizators/s2583 2021-12-30 12:44:25 +03:00
abd72b9e0d analizators/s3903 2021-12-29 18:49:02 +03:00
973f8a41b9 analizators/s2259 2021-12-29 18:47:35 +03:00
632783b130 analizators/s4275 2021-12-29 18:12:39 +03:00
facc97b01c analizators/s4423 2021-12-29 17:41:02 +03:00
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
5e91416c53 analizators/s4035 2021-12-28 18:44:54 +03:00
6cd3a7bfe1 analizators/s4201 2021-12-28 17:03:05 +03:00
28e1c652d9 analizators/s4456 2021-12-28 16:39:44 +03:00
c3321206bd analizators/s4487 2021-12-28 16:08:11 +03:00
0a786bbfa3 analizators/s4830 2021-12-28 15:00:48 +03:00
70bfe70563 Merge branch 'develop' into feature/optimization 2021-12-16 18:14:54 +03:00
fb3bfba1bd Files: optimization 2021-12-16 15:49:35 +03:00
04ccfb2caa Webhooks: fix empty result 2021-12-14 15:51:03 +03:00
b42fd9c03f Merge branch 'develop' into feature/reworked-user-service 2021-12-13 17:40:40 +03:00
0771a54c47 Optimization 2021-12-09 20:23:06 +03:00
0bd39bfc19 Core: optimization 2021-12-08 22:18:04 +03:00
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03:00
5dff970a42 AutoMigrationCreator: add new ef core dependencies 2021-11-30 13:32:16 +03:00
6f41a7f028 AutoMigrationCreator: net6 2021-11-30 12:02:20 +03:00
043dd3d180 net6: bugfix encrypt 2021-11-26 13:53:06 +03:00
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
fde636c586 net 6: update packages 2021-11-25 16:41:24 +03:00
58d84912dd fix 2021-11-25 11:23:35 +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
6ccda4d68d UserManager: revert cache 2021-11-23 15:25:34 +03:00
197ce829b4 Merge branch 'develop' into feature/reworked-user-service 2021-11-23 15:01:23 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
c7c7267a9a Test: Added new WrongTranslationVariablesTest and fix it's issues 2021-11-13 19:03:10 +03:00
0192c3265b Billing: fix 2021-11-12 15:33:03 +03:00
bf80a38df0 Tests: Fix NotFoundKeysTest for "Home:EmptyFolderHeader" and "Home:ContainsSpecCharacter" 2021-11-08 15:52:16 +03:00
90199126c7 Tests: Skip Banner.js (translations from firebase) from NotFoundKeysTest 2021-11-08 15:46:15 +03:00
1bc93172d3 OAuth: fix 2021-11-02 20:39:30 +03:00
aa79ef2c9d Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 14:03:26 +03:00
49c820b779 Merge branch 'develop' into feature/reworked-user-service 2021-11-02 13:07:07 +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
3b7f02339b Webhooks: fix 2021-10-29 20:02:45 +03:00
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00
b15bc7b5cf WebHook: fix service 2021-10-29 13:23:37 +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
3acecdc9ad Migration: fix warnings 2021-10-28 16:04:36 +03:00