IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
e6602a22ab
DocSpace-buildtools/web/ASC.Web.Core
History
pavelbannov e2cee2c2fc Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.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/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	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/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
..
Calendars moved from ddf515b8 2022-06-14 11:11:41 +03:00
Extensions fixed warnings 2022-04-14 22:23:57 +03:00
Files moved from ddf515b8 2022-06-14 11:11:41 +03:00
Helpers refactoring 2022-04-15 12:08:06 +03:00
HttpHandlers moved from ddf515b8 2022-06-14 11:11:41 +03:00
Jabber Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Log moved from ddf515b8 2022-06-01 17:07:08 +03:00
Mail dbcontext: EnableRetryOnFailure for MySQL provider 2022-05-25 16:55:38 +03:00
Mobile refactoring 2022-04-15 12:08:06 +03:00
ModuleManagement Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Notify moved from ddf515b8 2022-06-14 11:11:41 +03:00
protos refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
PublicResources Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
Security Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Sms moved from ddf515b8 2022-06-14 11:11:41 +03:00
Statistic dbcontext: EnableRetryOnFailure for MySQL provider 2022-05-25 16:55:38 +03:00
Subscriptions Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Tfa moved from ddf515b8 2022-06-14 11:11:41 +03:00
Users Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
Utility moved from ddf515b8 2022-06-15 12:46:21 +03:00
WebZones Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
WhiteLabel Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
AddonContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
ASC.Web.Core.csproj Merge branch 'release/v1.2' into develop 2022-06-19 22:44:48 +03:00
AuthService.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
CollaboratorSettings.cs code cleanup 2022-04-14 22:42:15 +03:00
CommonPhotoManager.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
CookiesManager.cs moved from ddf515b8 2022-06-14 11:11:41 +03:00
CustomNavigationSettings.cs code cleanup 2022-04-14 22:42:15 +03:00
EmailActivationSettings.cs code cleanup 2022-04-14 22:42:15 +03:00
FileSizeComment.cs refactoring 2022-04-15 12:08:06 +03:00
GlobalUsings.cs moved from ddf515b8 2022-06-01 17:07:08 +03:00
IAddon.cs refactoring 2022-04-15 12:08:06 +03:00
IModule.cs refactoring 2022-04-15 12:08:06 +03:00
IProduct.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
IWebItem.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
LoginProfileExtension.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
LogoUploader.cs Log: refactoring 2022-05-26 12:01:54 +03:00
ModuleContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
NavigationWebItem.cs refactoring 2022-04-15 12:08:06 +03:00
PersonalSettings.cs refactoring 2022-04-15 12:08:06 +03:00
PrivacyRoomSettings.cs moved from ddf515b8 2022-06-14 11:11:41 +03:00
Product.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
ProductContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
PromotionsSettings.cs code cleanup 2022-04-14 22:42:15 +03:00
QuotaSync.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-04-14 15:21:06 +03:00
Recaptcha.cs refactoring 2022-04-15 12:08:06 +03:00
SecutiryConstants.cs refactoring 2022-04-15 12:08:06 +03:00
SetupInfo.cs moved from ddf515b8 2022-06-14 11:11:41 +03:00
SpaceUsageStatManager.cs refactoring 2022-04-15 12:08:06 +03:00
SsoSettingsV2.cs fix 2022-04-29 10:49:56 +03:00
SsoUserData.cs fix 2022-04-29 18:25:49 +03:00
StudioAdminMessageSettings.cs code cleanup 2022-04-14 22:42:15 +03:00
StudioDefaultPageSettings.cs code cleanup 2022-04-14 22:42:15 +03:00
StudioTrustedDomainSettings.cs code cleanup 2022-04-14 22:42:15 +03:00
TariffSettings.cs refactoring 2022-04-15 12:08:06 +03:00
TipsSettings.cs code cleanup 2022-04-14 22:42:15 +03:00
WebItemContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
WebItemManager.cs add loggers 2022-05-13 17:48:49 +03:00
WebItemSecurity.cs refactoring 2022-04-15 12:08:06 +03:00
WebItemSecurityInfo.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00