IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9bfb54bcc3
DocSpace-buildtools/web/ASC.Web.Core
History
pavelbannov 7af929fee8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-07-07 17:41:41 +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 enum generator 2022-07-05 16:58:11 +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 fix bug 57725 2022-06-29 15:10:56 +03:00
protos
PublicResources Merge branch 'release/v1.2' into develop 2022-07-07 17:41:41 +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 'develop' into feature/docspace 2022-06-20 12:15:08 +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 fix for eb896018d4 2b19ec7997 2022-06-23 15:43:22 +03:00
AddonContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
ASC.Web.Core.csproj removed referencies 2022-07-06 18:47:16 +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 enum generator 2022-07-05 16:58:11 +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