IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
b14d6c8ef0
DocSpace-client/common
History
pavelbannov b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop 
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	config/appsettings.json
#	config/nlog.config
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/common/components/MoreLoginModal/index.tsx
#	packages/login/src/client/components/sub-components/LoginForm.tsx
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Core/CspSettingsHelper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-09-25 10:53:06 +03:00
..
ASC.ActiveDirectory removed Serializable attribute 2023-09-08 16:24:24 +03:00
ASC.Api.Core added room id 2023-09-14 17:35:54 +03:00
ASC.Common removed Serializable attribute 2023-09-08 16:24:24 +03:00
ASC.Core.Common Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
ASC.Data.Backup.Core Merge branch 'develop' into feature/optimization-ef 2023-09-13 12:28:33 +03:00
ASC.Data.Encryption merge from develop 2022-12-01 14:52:46 +03:00
ASC.Data.Reassigns ASC.Data.Reassigns: ReassignProgressItem: throwing OperationCanceledException to OnCompleted 2023-09-15 12:02:53 +03:00
ASC.Data.Storage Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
ASC.EventBus backend: updated some dll 2023-08-10 19:16:25 +03:00
ASC.EventBus.ActiveMQ backend: updated some dll 2023-08-08 19:43:14 +03:00
ASC.EventBus.Extensions.Logger fix 2023-06-28 20:10:44 +03:00
ASC.EventBus.RabbitMQ Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +03:00
ASC.FederatedLogin Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
ASC.Feed ef fix: update and traking 2023-09-12 18:23:45 +03:00
ASC.IPSecurity execute delete in SaveAsync 2023-09-19 17:00:54 +03:00
ASC.MessagingSystem refactoring 2023-08-10 16:19:48 +03:00
ASC.Migration added ar 2023-09-08 17:12:01 +03:00
ASC.Notify.Textile ASC.Notify.Textile: ar-SA direction rtl 2023-09-18 17:06:13 +03:00
ASC.Resource.Manager fix 2023-03-21 14:47:14 +03:00
ASC.Socket.IO optimized socket notification on tag changes 2023-09-04 13:20:32 +03:00
ASC.SsoAuth SSO: Changed authUrl 2023-08-31 14:32:47 +04:00
ASC.Textile Fix documentation warnings 2023-03-29 19:25:20 +05:00
ASC.Thumbnails
ASC.WebDav removed x-rewriter-url 2023-05-03 20:25:50 +03:00
ASC.Webhooks.Core Merge branch 'develop' into feature/optimization-ef 2023-09-13 12:28:33 +03:00
ASC.WebPlugins logger: configure logStreamName in aws logger target on startup 2023-04-13 17:41:23 +03:00
services Merge branch 'develop' into feature/optimization-ef 2023-09-13 12:28:33 +03:00
Tests disable punctuation tests 2023-09-13 14:21:13 +03:00
Tools fix build 2023-09-08 11:47:40 +03:00