|
|
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 |
|
|
|
6c28b6777d
|
added DarkThemeSettings
|
2022-04-20 17:19:06 +03:00 |
|
|
|
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 |
|
|
|
66ccce8eb5
|
Settings: refactoring
|
2022-03-24 12:35:00 +03:00 |
|
|
|
62fbab1185
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-22 13:20:43 +03:00 |
|
|
|
568f427957
|
IDE1006
|
2022-03-17 19:57:02 +03:00 |
|
|
|
65db98f65c
|
added new license headers
|
2022-03-15 21:00:53 +03:00 |
|
|
|
3d50d7977b
|
removed past license headers
|
2022-03-15 19:59:24 +03:00 |
|
|
|
b9719755be
|
Added ThrowIfNull
|
2022-03-09 20:15:51 +03:00 |
|
|
|
809359c85b
|
Core: used file-scoped namespaces
|
2022-02-15 14:52:43 +03:00 |
|
|
|
ca7140186d
|
Core: resolve properties for mapping, add mapping/projection
|
2022-02-15 13:30:05 +03:00 |
|
|
|
481581e424
|
Core: private properties replaced by private fields, add braces
|
2022-02-15 00:02:57 +03:00 |
|
|
|
320a1f2250
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/Data/StreamExtension.cs
# common/ASC.Common/Utils/RandomString.cs
# common/ASC.Core.Common/Billing/CouponManager.cs
# common/ASC.Core.Common/Billing/License/LicenseReader.cs
# common/ASC.Core.Common/Core/UserGroupRef.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/Jabber/JabberServiceClientWcf.cs
# common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/JabberStyler.cs
# common/ASC.Textile/Blocks/GlyphBlockModifier.cs
# common/ASC.Textile/States/TableRowFormatterState.cs
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ClearEvents/Program.cs
# common/services/ASC.TelegramService/Startup.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Core/Entries/File.cs
# products/ASC.Files/Core/Core/Entries/FileEntry.cs
# products/ASC.Files/Core/Core/Entries/FileHelper.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.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/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Sms/SmsKeyStorage.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# web/ASC.Web.HealthChecks.UI/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2022-02-10 13:16:33 +03:00 |
|
|
|
7ab885b2e2
|
refactoring: bugfix
|
2022-01-31 16:56:30 +03:00 |
|
|
|
9bccfa3ade
|
refactoring: add globalUsing: core.common
|
2022-01-26 13:43:08 +03:00 |
|
|
|
fce8d26cef
|
analizators/ca1507
|
2022-01-24 13:49:00 +03:00 |
|
|
|
ae53ed0d62
|
analizators/s1117
|
2022-01-21 12:27:39 +03:00 |
|
|
|
728c1b896e
|
analizators/s1104
|
2022-01-21 12:19:57 +03:00 |
|
|
|
53ee0ef484
|
fixed warnings
|
2021-06-16 18:00:27 +03:00 |
|
|
|
a5c6ba5dcc
|
Common, db: moved from 08a01422
|
2021-05-17 14:35:00 +03:00 |
|
|
|
d823516aa3
|
fixed profile removed resource
|
2021-02-03 14:07:18 +03:00 |
|
|
|
bfa73ec5c2
|
moved from 2e37dcd0
|
2020-12-28 16:22:08 +03:00 |
|
|
|
1d2f65ba12
|
Refactoring: scope
|
2020-10-20 23:10:17 +03:00 |
|
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
SuhorukovAnton
|
d866eccade
|
fix-messages: IDE0044
|
2020-09-28 18:42:03 +03:00 |
|
|
|
a35a79c96a
|
moved from release/11 4414f77b
|
2020-09-18 10:59:23 +03:00 |
|
|
|
dc98b02d4f
|
fix
|
2020-09-04 12:20:12 +03:00 |
|
SuhorukovAnton
|
90f1c4fa3d
|
Merge branch 'master' into feature/scope
|
2020-08-31 11:29:44 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
SuhorukovAnton
|
055e787d63
|
scope: fix
|
2020-08-24 21:41:06 +03:00 |
|
|
|
f00a964c32
|
Merge branch 'master' into feature/private
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-08-14 17:19:36 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
|
7f095f03d1
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
|
2020-07-15 15:23:28 +03:00 |
|
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
|
|
dc93975a51
|
fixed check confirm method
|
2020-07-02 19:14:03 +03:00 |
|
|
|
da9423bfdc
|
Wizard: api
|
2020-07-02 17:11:59 +03:00 |
|
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +03:00 |
|
|
|
4bad85defe
|
moved from hotfix/10.5.2
|
2020-01-17 16:58:26 +03:00 |
|
|
|
3586867429
|
EF: DbUserService
|
2019-11-25 12:49:12 +03:00 |
|
|
|
e9b6976187
|
Renamed all "*factory" classes to "*Extension"
|
2019-11-11 14:50:46 +03:00 |
|
|
|
6ac10fac2f
|
ISettings replaced with ISettingsExt
|
2019-11-08 18:11:30 +03:00 |
|
|
|
32781a87e2
|
DI: refactoring. Extract settings helpers
|
2019-11-08 15:21:51 +03:00 |
|
|
|
0801877060
|
DI: ASC.Studio.Notify.
Settings: AutoMapper
|
2019-11-01 16:56:47 +03:00 |
|
|
|
402c4d908d
|
DI: refactoring
|
2019-10-31 14:28:30 +03:00 |
|
|
|
8ca3a63e24
|
DI: refactoring
|
2019-10-22 19:08:37 +03:00 |
|
|
|
d8fb67f683
|
Merge branch 'master' into refactoring/di
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Utility/CommonLinkUtility.cs
|
2019-09-27 13:45:37 +03:00 |
|
|
|
84ba343460
|
Auth: added check confirm method
|
2019-09-26 16:36:53 +03:00 |
|
