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

612 Commits

Author SHA1 Message Date
pavelbannov
9eba173a44 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Model/CreateFileModel.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2022-04-21 22:36:29 +03:00
Alexey Safronov
fd9dc93fe6 Merge branch 'develop' into feature/virtual-rooms-1.2 
# Conflicts:
#	config/kafka.json
 2022-04-21 18:54:28 +03:00
pavelbannov
1dff9e18c4 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.IPSecurity/IPRestrictionsRepository.cs
#	common/ASC.IPSecurity/IPRestrictionsService.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
 2022-04-21 17:51:31 +03:00
pavelbannov
301e70e605 Api: added continue, suspend, delete portal methods 2022-04-21 12:35:51 +03:00
pavelbannov
e603b26caa refactoring 2022-04-15 13:27:48 +03:00
pavelbannov
cb2580dd50 refactoring 2022-04-15 12:08:06 +03:00
pavelbannov
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
pavelbannov
f138ff7c79 fixed warnings 2022-04-14 22:23:57 +03:00
pavelbannov
26947072c6 Merge branch 'feature/backend-refactor' into feature/warnings 
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskProgress.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
#	common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FileDto.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Core/CollaboratorSettings.cs
#	web/ASC.Web.Core/CustomNavigationSettings.cs
#	web/ASC.Web.Core/EmailActivationSettings.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/SpamEmailSettings.cs
#	web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
#	web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
#	web/ASC.Web.Core/PersonalSettings.cs
#	web/ASC.Web.Core/PrivacyRoomSettings.cs
#	web/ASC.Web.Core/PromotionsSettings.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Sms/SmsSender.cs
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
#	web/ASC.Web.Core/StudioAdminMessageSettings.cs
#	web/ASC.Web.Core/StudioDefaultPageSettings.cs
#	web/ASC.Web.Core/StudioTrustedDomainSettings.cs
#	web/ASC.Web.Core/TariffSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
#	web/ASC.Web.Core/TipsSettings.cs
#	web/ASC.Web.Core/Users/CustomNamingPeople.cs
#	web/ASC.Web.Core/Users/UserHelpTourSettings.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
#	web/ASC.Web.Core/Utility/ColorThemesSettings.cs
#	web/ASC.Web.Core/Utility/PasswordSettings.cs
#	web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
 2022-04-14 15:21:06 +03:00
Timofey Boyko
792bd7065f Merge branch 'develop' into feature/virtual-rooms-1.2 2022-04-13 10:22:20 +03:00
Alexey Bannov
4828678e03 merge from feature/backend-refactor 2022-04-12 22:04:10 +03:00
pavelbannov
f9720af935 Settings: EnableAdmMess 2022-04-12 21:26:32 +03:00
pavelbannov
b31015bddd fix portalrename 2022-04-12 09:28:49 +03:00
pavelbannov
50655ae61c added portal rename method 2022-04-11 18:19:56 +03:00
Viktor Fomin
433c684d09 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-11 12:08:50 +03:00
SuhorukovAnton
f9da8e4026 iprestrictions 
fix Verify
add check enable
add api method
 2022-04-07 13:19:30 +03:00
Alexey Bannov
2370f7bad5 refactoring DistributedTask. replace return value from string to dynamic for indexer 2022-04-01 10:10:15 +03:00
Alexey Bannov
90623263e9 merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
pavelbannov
03efcf7f00 Notify: remove serviceProvider 2022-03-29 13:53:05 +03:00
pavelbannov
f55a6cb6b2 Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider 
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
 2022-03-28 17:45:42 +03:00
pavelbannov
e7e0f5327a Merge branch 'feature/backend-refactor' into feature/log-refactor 
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
 2022-03-28 14:29:36 +03:00
pavelbannov
50a882a2b4 merge 2022-03-28 12:54:01 +03:00
pavelbannov
e5229f12f5 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
#	common/ASC.Data.Storage/Configuration/StorageSettings.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	products/ASC.Files/Core/Core/ResponseStream.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
 2022-03-28 12:53:15 +03:00
MaksimChegulov
abae61f2db IDE1006 2022-03-25 19:26:06 +03:00
Alexey Bannov
cd1d3058ff DistributedTaskQueue refactoring 2022-03-25 19:15:28 +03:00
gazizova-vlada
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
SuhorukovAnton
c7712fd7dc Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-24 18:01:09 +03:00
pavelbannov
66ccce8eb5 Settings: refactoring 2022-03-24 12:35:00 +03:00
MaksimChegulov
cb4d39e427 refactor 2022-03-23 19:23:25 +03:00
MaksimChegulov
a857089ee6 renamed 2022-03-23 17:33:43 +03:00
MaksimChegulov
079618e4e2 refactor 2022-03-23 16:08:27 +03:00
Alexey Bannov
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +03:00
MaksimChegulov
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03:00
MaksimChegulov
62fbab1185 Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Alexey Bannov
172eaa8985
Merge pull request #589 from ONLYOFFICE/feature/update-packages 
Feature/update packages
 2022-03-21 22:24:11 +04:00
MaksimChegulov
e9671701cb Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core 2022-03-21 17:39:01 +03:00
Alexey Bannov
010697ec97
Merge pull request #592 from ONLYOFFICE/bugfix/refactoring-fix 
Bugfix/refactoring fix
 2022-03-21 17:54:54 +04:00
MaksimChegulov
6e4761b8c2 Systemd package moved to shared ASC.Api.Core 2022-03-21 16:40:09 +03:00
MaksimChegulov
d207bcee3a added missing method 2022-03-18 13:38:40 +03:00
Alexey Bannov
88e2f01913 merge from feature/backend-refactor 2022-03-18 11:12:16 +03:00
Alexey Bannov
645607aae5 default IOptionsMonitor<ILog> => ILog 2022-03-18 11:04:29 +03:00
SuhorukovAnton
568f427957 IDE1006 2022-03-17 19:57:02 +03:00
SuhorukovAnton
80eb1c8257 IDE0011 2022-03-17 18:01:39 +03:00
Alexey Safronov
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign 
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
 2022-03-16 11:03:07 +03:00
MaksimChegulov
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
MaksimChegulov
3d50d7977b removed past license headers 2022-03-15 19:59:24 +03:00
MaksimChegulov
6af313db1d WebApi: refactor 2022-03-15 18:48:29 +03:00
SuhorukovAnton
07bacab25d fix merge: ThrowIfNull 2022-03-15 14:12:29 +03:00
SuhorukovAnton
5dd68fee6c automapper instead of ToSmtpSettings 2022-03-15 14:11:19 +03:00
SuhorukovAnton
82daaf4029 rename model to inDto 2022-03-15 13:56:22 +03:00