IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,410 Commits 38 Branches 22 Tags 359 MiB
bf24041594
Commit Graph

1116 Commits

Author SHA1 Message Date
MaksimChegulov
3f27bb6ce5 Merge branch 'develop' into feature/public-room-backend 2023-07-12 14:37:37 +03:00
pavelbannov
040377198f People: filter by employeeTypes 2023-07-12 13:10:47 +03:00
pavelbannov
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
pavelbannov
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
MaksimChegulov
80deac02c5 Merge branch 'develop' into feature/public-room-backend 2023-06-02 16:42:16 +03:00
Anton Sukhorukov
f5620a3666 Merge branch 'develop' into feature/optimization-queries 2023-06-01 23:52:40 +03:00
pavelbannov
746962bc06 Merge branch 'develop' into features/security-elasticsearch 2023-06-01 15:45:31 +03:00
Anton Sukhorukov
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
Anton Sukhorukov
15ea9521c1 refactoring 2023-06-01 14:01:21 +03:00
Anton Sukhorukov
c44e162162 fix ClearEventsService 2023-06-01 13:58:52 +03:00
Anton Sukhorukov
1dce9ba876 refactoring 2023-06-01 13:54:19 +03:00
Anton Sukhorukov
a6cfdc252e fix 2023-05-31 12:04:20 +03:00
pavelbannov
bd62a2a4fd removed .result 2023-05-31 10:42:09 +03:00
Anton Sukhorukov
78c9a7713a CompileAsyncQuery: PortalControllerHelper 2023-05-30 16:21:52 +03:00
Anton Sukhorukov
e557a73b36 CompileAsyncQuery NotifyCleanerService 2023-05-30 16:17:05 +03:00
Anton Sukhorukov
98fb5838b9 CompileAsyncQuery: MobileAppInstallRegistrator 2023-05-30 15:56:07 +03:00
pavelbannov
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
Anton Sukhorukov
e5359fad09 fix 2023-05-30 11:26:25 +03:00
Anton Sukhorukov
92d92905c4 CompileAsyncQuery:DbWorker 2023-05-29 16:58:15 +03:00
Anton Sukhorukov
8360f77177 Merge branch 'feature/optimization-ef' into feature/optimization-queries 2023-05-26 15:09:33 +03:00
Anton Sukhorukov
dc6b076ea8 fix 2023-05-26 14:06:44 +03:00
Anton Sukhorukov
8d088c30ce remove internal methods 2023-05-26 13:45:41 +03:00
Anton Sukhorukov
f39b300a2e CompileAsyncQuery: BaseIndexer 2023-05-25 12:51:55 +03:00
Anton Sukhorukov
bf8bd3a0ef CompileAsyncQuery: AuditEventsRepository 2023-05-25 11:19:03 +03:00
Anton Sukhorukov
d7cee576a0 fix async 2023-05-21 00:48:08 +03:00
Anton Sukhorukov
fab1e08cc5 fix GetOldEventsAsync 2023-05-21 00:34:05 +03:00
Anton Sukhorukov
e1bbd9a389 fix GetOldEventsAsync 2023-05-21 00:28:04 +03:00
Anton Sukhorukov
76e80de7be fix ElasticSearchService- ReIndex 2023-05-21 00:23:44 +03:00
Maria-Sukhova
8f1e35b818 added translations 2023-05-19 17:23:00 +03:00
pavelbannov
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
Maria-Sukhova
819c6597f4 added translations 2023-05-18 18:23:26 +03:00
SuhorukovAnton
5cbdfdef9b Merge branch 'develop' into feature/optimization-ef 2023-05-17 11:01:32 +03:00
SuhorukovAnton
e0f82c1a86 Merge branch 'hotfix/v1.0.1' into feature/remove-unused-resources 2023-05-16 11:25:26 +03:00
Maria-Sukhova
47a8b890da added translations 2023-05-15 17:52:57 +03:00
SuhorukovAnton
c65685b9ef fix 2023-05-12 22:53:18 +03:00
SuhorukovAnton
6efa64b91b remove unused resources 2023-05-12 22:48:47 +03:00
SuhorukovAnton
5a92a23467 remove crm resource 2023-05-12 17:36:47 +03:00
SuhorukovAnton
cff0bed424 Bug 62544 - Settings:Restore: add elastic.json in ASC.Data.Backup.BackgroundTasks 2023-05-12 14:56:36 +03:00
Maria-Sukhova
4f10368a78 added translations 2023-05-11 19:12:10 +03:00
Maria-Sukhova
4817ccbfb3 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1 2023-05-10 18:43:17 +03:00
Maria-Sukhova
a0293fee03 added translations 2023-05-10 18:42:42 +03:00
pavelbannov
322fb1aba3 fixed slow stopping service 2023-05-10 10:51:26 +03:00
pavelbannov
976c288d32 Merge branch 'hotfix/v1.0.1' into bugfix/61992 2023-05-08 17:30:29 +03:00
NikitaVashchuk
ea31657287 fix bug 61992 2023-05-05 21:44:35 +05:00
Maria-Sukhova
13a156bea9 added translations 2023-05-05 18:57:21 +03:00
Maria-Sukhova
738ae4e38d added translations 2023-05-04 19:20:39 +03:00
Maria-Sukhova
7bed1e829c edited Chinese 2023-05-02 15:14:05 +03:00
MaksimChegulov
a097e5659e Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room 2023-04-27 19:44:00 +03:00
Maria-Sukhova
8687b3ae99 edited translations 2023-04-27 17:42:34 +03:00
MaksimChegulov
5386e9b2de AuditTrail: DocumentsActionMapper: renamed links actions 2023-04-25 19:31:14 +03:00