DocSpace-buildtools/common
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
..
ASC.ActiveDirectory Merge branch 'develop' into feature/stripe 2022-09-23 16:11:23 +03:00
ASC.Api.Core Merge branch 'develop' into feature/stripe 2022-09-23 16:11:23 +03:00
ASC.Common Merge branch 'develop' into feature/stripe 2022-09-23 16:11:23 +03:00
ASC.Core.Common Merge branch 'develop' into feature/stripe 2022-09-23 16:11:23 +03:00
ASC.Data.Backup.Core Merge branch 'develop' into feature/stripe 2022-09-23 16:11:23 +03:00
ASC.Data.Encryption
ASC.Data.Reassigns
ASC.Data.Storage Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe 2022-09-19 22:59:12 +03:00
ASC.EventBus fixed warnings 2022-08-29 15:27:50 +03:00
ASC.EventBus.Extensions.Logger fixed tests and tools 2022-07-29 20:23:19 +03:00
ASC.EventBus.RabbitMQ packages updated 2022-08-01 13:58:12 +03:00
ASC.FederatedLogin FederatedLogin: deleted unnecessary 2022-08-30 13:08:55 +03:00
ASC.Feed Feed: added usings 2022-09-02 19:00:01 +03:00
ASC.IPSecurity - added functionality for adding ip restrictions for users and admins separately 2022-09-05 15:48:41 +04:00
ASC.MessagingSystem Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
ASC.Migration Merge branch 'develop' into feature/room-security 2022-09-19 11:54:55 +03:00
ASC.Notify.Textile
ASC.Resource.Manager
ASC.Socket.IO removed ignored files 2022-08-12 16:11:25 +03:00
ASC.SsoAuth removed ignored files 2022-08-12 16:11:25 +03:00
ASC.Textile
ASC.Thumbnails
ASC.UrlShortener removed ignored files 2022-08-12 16:11:25 +03:00
ASC.WebDav removed ignored files 2022-08-12 16:11:25 +03:00
ASC.Webhooks.Core Api: webhooks retry 2022-08-22 14:00:57 +03:00
ASC.WebPlugins Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-09 17:34:19 +03:00
services Merge branch 'develop' into feature/stripe 2022-09-19 18:16:34 +03:00
Tests Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
Tools fix 2022-09-12 19:41:16 +03:00