IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18a2c0a53d
DocSpace-buildtools/web/ASC.Web.Core
History
pavelbannov 18a2c0a53d Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
2021-03-25 21:50:09 +03:00
..
Calendars revert discard 2020-10-12 22:39:23 +03:00
Extensions revert discard 2020-10-12 22:39:23 +03:00
Files Code cleanup 2020-11-17 13:00:01 +03:00
Helpers Code cleanup 2020-11-17 13:00:01 +03:00
Jabber Settings: added authproviders and login.ashx 2020-07-28 11:13:49 +03:00
Mail Files: removed temp 2021-01-13 12:41:29 +03:00
Mobile MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
ModuleManagement fix 2020-08-27 17:01:37 +03:00
Notify fixed SendEmailActivationInstructions 2021-03-22 18:56:04 +03:00
Properties
protos
PublicResources moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
Security fix 2020-08-27 17:01:37 +03:00
Sms Files: removed temp 2021-01-13 12:41:29 +03:00
Statistic Scope: refactoring 2020-10-19 18:53:15 +03:00
Subscriptions fix 2020-08-27 17:01:37 +03:00
Tfa MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
Users Merge branch 'develop' into feature/dotnet5 2021-03-25 21:50:09 +03:00
Utility Merge branch 'develop' into feature/dotnet5 2021-01-22 16:34:40 +03:00
WebZones
WhiteLabel Files: removed temp 2021-01-13 12:41:29 +03:00
AddonContext.cs
ASC.Web.Core.csproj Merge branch 'develop' into feature/dotnet5 2021-01-22 16:34:40 +03:00
AuthService.cs fix warnings 2020-10-12 16:52:31 +03:00
CollaboratorSettings.cs
CommonPhotoManager.cs Removed sq bugs and code smells 2020-10-16 16:21:59 +03:00
CookiesManager.cs Scope: refactoring 2020-10-19 18:53:15 +03:00
CustomNavigationSettings.cs
EmailActivationSettings.cs
FileSizeComment.cs Scope: refactoring 2020-10-19 18:53:15 +03:00
IAddon.cs
IModule.cs fix 2020-08-27 17:01:37 +03:00
IProduct.cs fix 2020-08-27 17:01:37 +03:00
IWebItem.cs
LoginProfileExtension.cs
LogoUploader.cs Scope: refactoring 2020-10-19 18:53:15 +03:00
ModuleContext.cs
NavigationWebItem.cs fix 2020-08-27 17:01:37 +03:00
PersonalSettings.cs Scope: refactoring 2020-10-19 18:53:15 +03:00
PrivacyRoomSettings.cs fix 2020-10-14 12:11:04 +03:00
Product.cs Api: modules. Added info method 2021-01-25 17:37:26 +03:00
ProductContext.cs
PromotionsSettings.cs
QuotaSync.cs Scope: refactoring 2020-10-19 18:53:15 +03:00
SecutiryConstants.cs
SetupInfo.cs moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
SpaceUsageStatManager.cs
StudioAdminMessageSettings.cs Api: added SaveMailDomainSettings, EnableAdminMessageSettings 2020-07-22 14:03:38 +03:00
StudioDefaultPageSettings.cs
StudioTrustedDomainSettings.cs Api: added SaveMailDomainSettings, EnableAdminMessageSettings 2020-07-22 14:03:38 +03:00
TariffSettings.cs revert discard 2020-10-12 22:39:23 +03:00
TipsSettings.cs fix 2020-08-27 17:01:37 +03:00
WebItemContext.cs fix 2020-08-27 17:01:37 +03:00
WebItemManager.cs Fixed loading products, lazy loading webitemmanager 2021-01-26 12:29:50 +03:00
WebItemSecurity.cs Files: removed temp 2021-01-13 12:41:29 +03:00
WebItemSecurityInfo.cs fix 2020-08-27 17:01:37 +03:00