IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5e6ad050ab
DocSpace-buildtools/web/ASC.Web.Core
History
pavelbannov e01ee037f2 Merge branch 'master' into feature/fix-messages 
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Core.Common/EF/Context/CoreDbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContext.cs
#	common/ASC.Core.Common/EF/Context/DbContextManager.cs
#	common/ASC.Core.Common/EF/Context/FeedDbContext.cs
#	common/ASC.Core.Common/EF/Context/FilesDbContext.cs
#	common/ASC.Core.Common/EF/Context/MessagesContext.cs
#	common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
#	common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	common/ASC.Core.Common/EF/Model/AccountLinks.cs
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
#	common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
#	common/ASC.Core.Common/EF/Model/Core/Subscription.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
#	common/ASC.Core.Common/EF/Model/TelegramUser.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
#	common/ASC.Core.Common/EF/Model/User/UserGroup.cs
#	common/ASC.Core.Common/HostedSolution.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.VoipService/Dao/CachedVoipDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
#	products/ASC.Files/Core/Core/EF/DbFile.cs
#	products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
#	products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
#	products/ASC.Files/Core/Core/EF/DbFolderTree.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
#	products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
2020-10-09 15:40:44 +03:00
..
Calendars fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
Extensions fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
Files fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
Helpers fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
Jabber Settings: added authproviders and login.ashx 2020-07-28 11:13:49 +03:00
Mail Merge branch 'master' into feature/fix-messages 2020-10-09 15:40:44 +03:00
Mobile fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
ModuleManagement fix 2020-08-27 17:01:37 +03:00
Notify fix-messages: IDE0062 2020-09-30 15:46:16 +03:00
Properties Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
protos Removed TenantProvider 2019-09-16 17:51:39 +03:00
PublicResources moved from release/11 4414f77b 2020-09-22 17:17:17 +03:00
Security fix 2020-08-27 17:01:37 +03:00
Sms fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
Statistic fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
Subscriptions fix 2020-08-27 17:01:37 +03:00
Tfa fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
Users fix-messages: IDE0022 2020-09-30 17:47:42 +03:00
Utility fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
WebZones Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
WhiteLabel fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
AddonContext.cs Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
ASC.Web.Core.csproj Resource: fix 2020-07-15 12:55:31 +03:00
AuthService.cs moved from release/11 4414f77b 2020-09-18 17:45:59 +03:00
CollaboratorSettings.cs Fix License 2020-07-08 18:30:23 +03:00
CommonPhotoManager.cs IDE0063 2019-08-15 18:08:40 +03:00
CookiesManager.cs private: firtst version 2020-08-12 12:58:08 +03:00
CustomNavigationSettings.cs Fix License 2020-07-08 18:30:23 +03:00
EmailActivationSettings.cs Fix License 2020-07-08 18:30:23 +03:00
FileSizeComment.cs private: firtst version 2020-08-12 12:58:08 +03:00
IAddon.cs Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
IModule.cs fix 2020-08-27 17:01:37 +03:00
IProduct.cs fix 2020-08-27 17:01:37 +03:00
IWebItem.cs People as external product 2019-07-05 16:58:04 +03:00
LoginProfileExtension.cs Files: GoogleDriveApp 2020-02-03 16:31:42 +03:00
LogoUploader.cs fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
ModuleContext.cs Added ASC.Web.Core 2019-06-07 11:59:07 +03:00
NavigationWebItem.cs fix 2020-08-27 17:01:37 +03:00
PersonalSettings.cs fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
PrivacyRoomSettings.cs fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
Product.cs DI: configuration 2019-09-23 15:20:08 +03:00
ProductContext.cs Api: get modules via WebItemManager 2019-06-10 15:17:45 +03:00
PromotionsSettings.cs Fix License 2020-07-08 18:30:23 +03:00
QuotaSync.cs fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
SecutiryConstants.cs Api: added settings controller 2019-08-12 13:53:12 +03:00
SetupInfo.cs fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
SpaceUsageStatManager.cs Code Cleanup 2019-08-15 15:04:42 +03:00
StudioAdminMessageSettings.cs Api: added SaveMailDomainSettings, EnableAdminMessageSettings 2020-07-22 14:03:38 +03:00
StudioDefaultPageSettings.cs Fix License 2020-07-08 18:30:23 +03:00
StudioTrustedDomainSettings.cs Api: added SaveMailDomainSettings, EnableAdminMessageSettings 2020-07-22 14:03:38 +03:00
TariffSettings.cs fix-messages: IDE0058 2020-09-30 14:50:39 +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 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
WebItemSecurity.cs fix-messages: IDE0022 2020-09-30 17:47:42 +03:00
WebItemSecurityInfo.cs fix 2020-08-27 17:01:37 +03:00