DocSpace-client/public
Ilya Oleshko e531654c54 Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/Context/SecurityContext.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/RoomLogosModuleSpecifics.cs
#	common/ASC.EventBus.RabbitMQ/ASC.EventBus.RabbitMQ.csproj
#	common/ASC.EventBus.RabbitMQ/DefaultRabbitMQPersistentConnection.cs
#	config/nginx/onlyoffice.conf
#	packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/common/api/files/index.js
#	packages/components/.storybook/preview.js
#	packages/components/package.json
#	packages/editor/src/server/lib/helpers/index.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Server/Api/OperationController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-08-11 12:47:44 +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 'develop' into feature/public-room 2023-07-25 13:01:21 +03:00
locales Merge branch 'develop' into feature/deep-link 2023-08-04 19:01:14 +04:00
offline Web: Removed duplicates 2021-09-24 21:18:50 +03:00
scripts Merge branch 'master' into develop 2023-08-01 14:39:31 +03:00
thirdparty Web: Fixed callback pages, added login callback for desktop client 2021-10-19 10:31:34 +03:00
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