IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7f1d946269
DocSpace-buildtools/web/ASC.Web.Core
History
pavelbannov 7f1d946269 Merge branch 'develop' into feature/stripe 
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
..
Calendars moved from ddf515b8 2022-06-14 11:11:41 +03:00
Extensions Files: removed .result 2022-08-12 16:26:57 +03:00
Files Files: added new categories OForm,OFormTemplate 2022-09-14 18:56:18 +03:00
Helpers refactoring 2022-08-18 19:00:22 +03:00
HttpHandlers Merge branch 'develop' into feature/stripe 2022-09-23 16:11:23 +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
Mobile Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
ModuleManagement Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Notify Merge branch 'develop' into feature/stripe 2022-09-23 16:11:23 +03:00
protos refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
PublicResources Payment: UsersInRoomStatistic 2022-09-20 23:22:27 +03:00
Quota Quota: MaxFileSizeChecker 2022-09-19 22:49:41 +03:00
Security Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Sms refactoring 2022-09-15 18:58:05 +03:00
Statistic Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
Subscriptions Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
Tfa Settings: ignore id 2022-07-12 15:33:46 +03:00
Users Merge branch 'develop' into feature/stripe 2022-09-23 16:11:23 +03:00
Utility Merge branch 'develop' into feature/stripe 2022-09-23 16:11:23 +03:00
WebZones Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
WhiteLabel Payment: email settings 2022-09-02 16:09:16 +03:00
AddonContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
ASC.Web.Core.csproj packages updated 2022-08-01 13:58:12 +03:00
AuthService.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
CollaboratorSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
CommonPhotoManager.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
CookiesManager.cs Merge branch 'develop' into feature/migrations-fix 2022-07-25 12:59:19 +03:00
CustomNavigationSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
EmailActivationSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
FileSizeComment.cs refactoring 2022-04-15 12:08:06 +03:00
GlobalUsings.cs Api: payments check 2022-09-19 17:56:45 +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 Settings: ignore id 2022-07-12 15:33:46 +03:00
PrivacyRoomSettings.cs Settings: ignore id 2022-07-12 15:33:46 +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 Settings: ignore id 2022-07-12 15:33:46 +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 Api: payments check 2022-09-19 17:56:45 +03:00
SpaceUsageStatManager.cs refactoring 2022-04-15 12:08:06 +03:00
SsoSettingsV2.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
SsoUserData.cs fix 2022-04-29 18:25:49 +03:00
StudioAdminMessageSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
StudioDefaultPageSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
StudioTrustedDomainSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
TariffSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
TipsSettings.cs Settings: ignore id 2022-07-12 15:33:46 +03:00
WebItemContext.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
WebItemManager.cs removed voip 2022-07-18 12:24:12 +03:00
WebItemSecurity.cs Api: payments check 2022-09-19 17:56:45 +03:00
WebItemSecurityInfo.cs Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00