DocSpace-buildtools/products/ASC.Files/Service
Ilya Oleshko 19e8b2210a Merge branch 'master' into develop
# Conflicts:
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/common/components/Section/index.js
#	packages/components/floating-button/styled-floating-button.js
#	packages/login/src/client/App.tsx
#	packages/login/src/client/components/Invalid/index.tsx
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	yarn.lock
2023-05-29 14:36:12 +03:00
..
Cleanup Merge branch 'release/v1.0.0' into develop 2023-04-17 11:38:48 +04:00
Core fixed feed time zone 2023-04-07 11:57:02 +03:00
Expired fixed DeleteExpiredService 2023-03-10 22:32:30 +03:00
Extensions Merge branch 'develop' into feature/doc-space-info-panel 2022-09-16 18:26:36 +03:00
Log convert ooxml(pr 1304) 2023-03-21 13:42:19 +03:00
Properties rebbitmq: split default queue on separate queue 2022-10-26 17:21:37 +03:00
Thumbnail Merge branch 'master' into develop 2023-05-29 14:36:12 +03:00
appsettings.json Files: service replaced 2020-04-27 20:02:15 +03:00
ASC.Files.Service.csproj migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
feed.json Files.Service: added users module for feed aggregator 2023-01-18 18:36:06 +03:00
FileConverterService.cs Merge branch 'release/v1.0.0' into develop 2023-04-13 13:27:58 +04:00
GlobalUsings.cs Merge branch 'release/v1.0.0' into develop 2023-04-13 13:27:58 +04:00
Program.cs fix ide001 2022-11-07 12:49:29 +03:00
search.json fix 2020-07-16 16:02:21 +03:00
Startup.cs Merge branch 'release/v1.0.0' into develop 2023-04-13 13:27:58 +04:00