|
|
dff3333862
|
fix query
|
2023-06-29 11:32:05 +03:00 |
|
|
|
c4692c0e69
|
fixed query
|
2023-06-28 20:17:22 +03:00 |
|
|
|
9845542023
|
fix
|
2023-06-28 20:10:44 +03:00 |
|
|
|
23889afe39
|
fix
|
2023-06-28 18:07:50 +03:00 |
|
|
|
bce52a2549
|
fixed query
|
2023-06-28 13:52:14 +03:00 |
|
|
|
bfb9a096e6
|
Merge branch 'develop' into feature/optimization-queries
# Conflicts:
# common/ASC.Core.Common/Billing/License/LicenseReader.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Data/DbAzService.cs
# common/ASC.Core.Common/Data/DbQuotaService.cs
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Feed/Data/FeedAggregateDataProvider.cs
# common/ASC.Feed/Data/FeedReadedDataProvider.cs
# common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
# common/ASC.Webhooks.Core/DbWorker.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
|
2023-06-27 18:29:23 +03:00 |
|
|
|
116d4c8174
|
Merge pull request #1491 from ONLYOFFICE/bugfix/fix-migration-namespaces
Bugfix/fix migration namespaces
|
2023-06-27 02:37:30 -07:00 |
|
|
|
0bd332d2a9
|
fix migrations
|
2023-06-27 12:18:04 +03:00 |
|
|
|
265335d371
|
fix
|
2023-06-26 11:33:37 +03:00 |
|
|
|
01bbf1fb5e
|
rename migration.core to migrations.core
|
2023-06-26 11:12:57 +03:00 |
|
|
|
7c7e20dfa3
|
fix migration namespace
|
2023-06-25 02:15:36 +03:00 |
|
|
|
09ffbbba7e
|
create migration context
|
2023-06-21 15:40:55 +03:00 |
|
|
|
67eac48247
|
fix migration
|
2023-06-19 16:31:56 +03:00 |
|
|
|
3d694ad5ae
|
Merge branch 'develop' into feature/delete-portal
# Conflicts:
# common/ASC.Webhooks.Core/EF/Model/WebhooksLog.cs
# web/ASC.Web.Studio/GlobalUsings.cs
# web/ASC.Web.Studio/Startup.cs
|
2023-06-19 11:46:35 +03:00 |
|
|
|
1905566b90
|
refactoring
|
2023-06-09 14:28:49 +03:00 |
|
|
|
ba345c0f06
|
fix merge
|
2023-06-09 14:04:55 +03:00 |
|
|
|
986561d4e9
|
Merge branch 'develop' into feature/delete-portal
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbAzService.cs
# common/ASC.Core.Common/Data/DbQuotaService.cs
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Data/DbUserService.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# common/ASC.Feed/Data/FeedAggregateDataProvider.cs
# common/ASC.Feed/Data/FeedReadedDataProvider.cs
# common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
# common/services/ASC.ApiSystem/Controllers/PeopleController.cs
# migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/ConnectionsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/LicenseController.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
# web/ASC.Web.Core/Sms/SmsManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2023-06-08 15:53:31 +03:00 |
|
|
|
7ba5cc975b
|
Webhooks: fixed migrations
|
2023-06-07 21:23:38 +03:00 |
|
|
|
f4f5edec05
|
Merge branch 'develop' into feature/webhooks-page
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
|
2023-06-06 01:49:14 +03:00 |
|
|
|
f5620a3666
|
Merge branch 'develop' into feature/optimization-queries
|
2023-06-01 23:52:40 +03:00 |
|
|
|
9b456a71ae
|
fix
|
2023-06-01 15:59:17 +03:00 |
|
|
|
746962bc06
|
Merge branch 'develop' into features/security-elasticsearch
|
2023-06-01 15:45:31 +03:00 |
|
|
|
1f9ec5087b
|
fix
|
2023-06-01 14:30:20 +03:00 |
|
|
|
75ebc4ce65
|
fix await using
|
2023-06-01 14:27:27 +03:00 |
|
|
|
15ea9521c1
|
refactoring
|
2023-06-01 14:01:21 +03:00 |
|
|
|
c44e162162
|
fix ClearEventsService
|
2023-06-01 13:58:52 +03:00 |
|
|
|
1dce9ba876
|
refactoring
|
2023-06-01 13:54:19 +03:00 |
|
|
|
eaa733b7fa
|
CompileAsyncQuery: TelegramDao
|
2023-05-31 18:03:36 +03:00 |
|
|
|
869519758a
|
CompileAsyncQuery: TariffService
|
2023-05-31 17:07:09 +03:00 |
|
Vladimir Khvan
|
7619fe03e8
|
Merge branch 'develop' into feature/webhooks-page
|
2023-05-31 16:05:47 +05:00 |
|
|
|
a6cfdc252e
|
fix
|
2023-05-31 12:04:20 +03:00 |
|
|
|
9a3f0278a3
|
CompileAsyncQuery: RegisterInstanceDao
|
2023-05-31 10:55:03 +03:00 |
|
|
|
bd62a2a4fd
|
removed .result
|
2023-05-31 10:42:09 +03:00 |
|
|
|
dbbebc8c4b
|
CompileAsyncQuery: ProviderAccountDao
|
2023-05-30 22:23:11 +03:00 |
|
|
|
78c9a7713a
|
CompileAsyncQuery: PortalControllerHelper
|
2023-05-30 16:21:52 +03:00 |
|
|
|
e557a73b36
|
CompileAsyncQuery NotifyCleanerService
|
2023-05-30 16:17:05 +03:00 |
|
|
|
98fb5838b9
|
CompileAsyncQuery: MobileAppInstallRegistrator
|
2023-05-30 15:56:07 +03:00 |
|
|
|
720fff1455
|
CompileAsyncQuery: IPRestrictionsRepository
|
2023-05-30 15:50:17 +03:00 |
|
|
|
645afb959f
|
CompileAsyncQuery: InvitationLinkHelper
|
2023-05-30 15:42:15 +03:00 |
|
|
|
d7100426de
|
CompileAsyncQuery: IntegrationEventLogService
|
2023-05-30 15:39:28 +03:00 |
|
|
|
b99f5e24f3
|
CompileAsyncQuery: FirebaseDao
|
2023-05-30 14:15:20 +03:00 |
|
|
|
6c78438b75
|
Merge branch 'develop' into feature/optimization-ef
# Conflicts:
# common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/RegionHelper.cs
# common/ASC.Core.Common/Data/DbQuotaService.cs
# common/ASC.Core.Common/GeolocationHelper.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/ConnectionsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/RadicaleController.cs
# web/ASC.Web.Api/Api/Settings/TfaappController.cs
# web/ASC.Web.Api/Core/QuotaHelper.cs
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
|
2023-05-30 14:13:02 +03:00 |
|
|
|
7724669c7e
|
fix ef Find
|
2023-05-30 12:36:46 +03:00 |
|
|
|
e5359fad09
|
fix
|
2023-05-30 11:26:25 +03:00 |
|
|
|
9eeec5cc10
|
CompileAsyncQuery: FeedReadedDataProvider
|
2023-05-30 11:06:18 +03:00 |
|
|
|
3d7ef0ef5a
|
CompileAsyncQuery: FeedAggregateDataProvider
|
2023-05-29 23:26:14 +03:00 |
|
|
|
92d92905c4
|
CompileAsyncQuery:DbWorker
|
2023-05-29 16:58:15 +03:00 |
|
|
|
20320a8fb1
|
CompileAsyncQuery:DbWorker
|
2023-05-29 15:01:13 +03:00 |
|
|
|
19e8b2210a
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/helpers/constants.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/common/components/Section/index.js
# packages/components/floating-button/styled-floating-button.js
# packages/login/src/client/App.tsx
# packages/login/src/client/components/Invalid/index.tsx
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# yarn.lock
|
2023-05-29 14:36:12 +03:00 |
|
|
|
f364696ae2
|
CompileAsyncQuery: DbUserService
|
2023-05-29 12:48:09 +03:00 |
|
