IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,228 Commits 40 Branches 22 Tags 420 MiB
7c3af54718
Commit Graph

26 Commits

Author SHA1 Message Date
pavelbannov
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +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
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
pavelbannov
66ccce8eb5 Settings: refactoring 2022-03-24 12:35:00 +03:00
MaksimChegulov
62fbab1185 Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
SuhorukovAnton
568f427957 IDE1006 2022-03-17 19:57:02 +03:00
SuhorukovAnton
11004ab61c IDE0161 2022-03-17 18:13:38 +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
SuhorukovAnton
cefa25a391 refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
pavelbannov
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
pavelbannov
9a092cb8ec moved from release/11 4414f77b 2020-09-18 17:45:59 +03:00
AlexeySafronov
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
SuhorukovAnton
f8e42cbd08 api-defaultvalue: add JsonPropertyNames 2020-07-09 22:06:08 +03:00
pavelbannov
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
pavelbannov
da9423bfdc Wizard: api 2020-07-02 17:11:59 +03:00
pavelbannov
a3bee291a2 Added comments 2019-11-11 18:45:17 +03:00
pavelbannov
6ac10fac2f ISettings replaced with ISettingsExt 2019-11-08 18:11:30 +03:00
pavelbannov
32781a87e2 DI: refactoring. Extract settings helpers 2019-11-08 15:21:51 +03:00
pavelbannov
473207f9a4 DI: BaseSettings 2019-09-13 14:18:27 +03:00
pavelbannov
a91ea0ee67 BaseSettings: DI 2019-09-10 17:29:37 +03:00
pavelbannov
f6d78d3cba Code Cleanup 2019-08-15 15:04:42 +03:00
pavelbannov
377287570a Added ASC.Feed, ASC.IPSecurity 
Added Resources
 2019-06-14 19:14:24 +03:00