|
|
162b3cf36d
|
first version: backup s3 tar
|
2023-07-18 16:21:44 +03:00 |
|
|
|
a42d2f8b6c
|
Merge pull request #1515 from ONLYOFFICE/bugfix/webhooks
Bugfix/webhooks
|
2023-07-12 19:34:49 +04:00 |
|
|
|
040377198f
|
People: filter by employeeTypes
|
2023-07-12 13:10:47 +03:00 |
|
|
|
ab592bb7c9
|
People: added IsRoomAdmin field
|
2023-07-12 00:50:47 +03:00 |
|
|
|
d231ad2577
|
fix DbWorker
|
2023-07-10 10:53:53 +03:00 |
|
|
|
91fc1f0c04
|
ASC.Core.Common: DbUserService: fixed ObjectDisposedException
|
2023-07-07 12:56:09 +03:00 |
|
|
|
59b9980fd1
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-fixes
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2023-07-05 16:09:00 +03:00 |
|
|
|
89a609dd5e
|
Merge branch 'develop' into feature/ipsecurity-fixes
|
2023-07-03 13:22:25 +03:00 |
|
|
|
1d3534ab46
|
fixed query
|
2023-06-30 14:57:19 +03:00 |
|
|
|
2b1295455c
|
fix
|
2023-06-30 14:35:08 +03:00 |
|
|
|
20300337f3
|
fix query
|
2023-06-30 12:41:20 +03:00 |
|
|
|
164792e924
|
fix query
|
2023-06-30 12:22:37 +03:00 |
|
|
|
d6e3d3c3ba
|
ASC.Data.Reassigns: ReassignProgressItem: progress change
|
2023-06-29 11:47:43 +03:00 |
|
|
|
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 |
|
|
|
4f1a68d440
|
ASC.Data.Reassigns: ReassignProgressItem: run ReassignStorage method
|
2023-06-28 16:14:30 +03:00 |
|
|
|
bce52a2549
|
fixed query
|
2023-06-28 13:52:14 +03:00 |
|
|
|
13d5d61cad
|
ASC.IPSecurity: ip restriction range can't start with dash or slash
|
2023-06-28 10:52:21 +03:00 |
|
|
|
7e543a07bf
|
ASC.IPSecurity: optimization
|
2023-06-28 10:48:56 +03:00 |
|
|
|
879d190234
|
ASC.IPSecurity: fix for check CIDR restrictions with IPv6 addresses
|
2023-06-28 10:44:08 +03:00 |
|
|
|
cba8f62d8f
|
ASC.IPSecurity: fixed mapping after rename "tenant" to "tenantid" 4a1e1a88e7
|
2023-06-28 10:40:33 +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 |
|
