IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6af064e456
DocSpace-buildtools/public
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
..
css Web:Added new fonts open sans v35 2023-08-03 19:44:53 +05:00
fonts/v35 Web: Removed old fonts 2023-08-03 19:47:52 +05:00
images Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
locales Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
offline
scripts Merge branch 'hotfix/v1.1.3' into develop 2023-09-25 10:53:06 +03:00
thirdparty
appIcon-180.png Web: Client: Added new icons for browser shortcuts 2022-05-27 14:55:04 +03:00
appIcon-192.png Web: Client: Added new icons for browser shortcuts 2022-05-27 14:55:04 +03:00
appIcon-512.png Web: Client: Added new icons for browser shortcuts 2022-05-27 14:55:04 +03:00
favicon.ico Web: change path for favicon.ico 2023-01-23 13:21:51 +03:00
icon.svg Web: Client: Added new icons for browser shortcuts 2022-05-27 14:55:04 +03:00
manifest.json Update manifest.json 2022-11-13 22:35:19 +03:00