IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
320a1f2250
DocSpace-buildtools/web/ASC.Web.Core
History
pavelbannov 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
..
Calendars Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Extensions Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Files Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Helpers Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Jabber refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
Mail refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
Mobile Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
ModuleManagement refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
Notify Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
protos refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
PublicResources Bug 51393 - Personal: Security. There is possible to know email registered users with help "Signup" 2021-09-28 15:17:06 +03:00
Security refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
Sms Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Statistic refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
Subscriptions Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Tfa Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Users Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Utility Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
WebZones refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
WhiteLabel Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
AddonContext.cs
ASC.Web.Core.csproj Packages updated 2022-02-02 19:54:23 +03:00
AuthService.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
CollaboratorSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
CommonPhotoManager.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
CookiesManager.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
CustomNavigationSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
EmailActivationSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
FileSizeComment.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
GlobalUsings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
IAddon.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
IModule.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
IProduct.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
IWebItem.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
LoginProfileExtension.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
LogoUploader.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
ModuleContext.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
NavigationWebItem.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
PersonalSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
PrivacyRoomSettings.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Product.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
ProductContext.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
PromotionsSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
QuotaSync.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
Recaptcha.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
SecutiryConstants.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
SetupInfo.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
SpaceUsageStatManager.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
StudioAdminMessageSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
StudioDefaultPageSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
StudioTrustedDomainSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
TariffSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
TipsSettings.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
WebItemContext.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00
WebItemManager.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
WebItemSecurity.cs Merge branch 'develop' into feature/backend-refactor 2022-02-10 13:16:33 +03:00
WebItemSecurityInfo.cs refactoring: add globalusings: web.core 2022-01-31 11:30:08 +03:00