Tatiana Lopaeva c43d8c891a Merge branch 'develop' into feature/user-quota ... # Conflicts: # common/ASC.ActiveDirectory/Base/Data/LdapObjectExtension.cs # common/ASC.ActiveDirectory/LdapUserManager.cs # common/ASC.Api.Core/Model/EmployeeFullDto.cs # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Context/Impl/UserManager.cs # common/ASC.Core.Common/Core/IUserService.cs # common/ASC.Core.Common/Data/DbUserService.cs # common/ASC.Core.Common/EF/Context/UserDbContext.cs # common/ASC.Core.Common/Tenants/TenantUserQuotaSettings.cs # common/ASC.Core.Common/Users/UserQuotaSettings.cs # common/ASC.Data.Storage/BaseStorage.cs # common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs # common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs # common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs # common/ASC.Data.Storage/IDataStore.cs # common/ASC.Data.Storage/IQuotaController.cs # common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs # common/ASC.Data.Storage/S3/S3Storage.cs # common/ASC.Data.Storage/StorageFactory.cs # common/ASC.Data.Storage/TenantQuotaController.cs # migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs # packages/client/public/locales/en/Settings.json # packages/client/src/components/FilesPanels/index.js # packages/client/src/components/GlobalEvents/index.js # packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js # packages/client/src/components/dialogs/index.js # packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js # packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js # packages/client/src/pages/PortalSettings/components/MobileCategoryWrapper.js # packages/client/src/store/FilesActionsStore.js # packages/client/src/store/FilesStore.js # packages/client/src/store/PeopleStore.js # packages/common/api/people/index.js # packages/common/constants/index.js # products/ASC.Files/Core/ApiModels/RequestDto/CreateRoomRequestDto.cs # products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs # products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs # products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs # products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs # products/ASC.Files/Core/Core/EF/DbFolder.cs # products/ASC.Files/Core/Core/Entries/File.cs # products/ASC.Files/Core/Core/Entries/FileEntry.cs # products/ASC.Files/Core/Core/Entries/Folder.cs # products/ASC.Files/Core/Core/Entries/OrderBy.cs # products/ASC.Files/Core/Core/Entries/Tag.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/Core/Security/FileSecurity.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFileDao.cs # products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs # products/ASC.Files/Core/Core/Thirdparty/ThirdPartyProviderDao.cs # products/ASC.Files/Core/Core/UsersQuotaSyncOperation.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs # products/ASC.Files/Core/Utils/ChunkedUploadSessionHolder.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Server/Api/VirtualRoomsController.cs # products/ASC.People/Server/Api/UserController.cs # public/locales/en/Common.json # web/ASC.Web.Api/Api/Settings/SettingsController.cs # web/ASC.Web.Api/ApiModels/RequestsDto/QuotaSettingsRequestsDto.cs # web/ASC.Web.Api/ApiModels/ResponseDto/QuotaDto.cs # web/ASC.Web.Api/Core/QuotaHelper.cs # web/ASC.Web.Core/PublicResources/Resource.Designer.cs # web/ASC.Web.Core/PublicResources/Resource.resx		2023-10-04 16:56:49 +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/user-quota	2023-10-04 16:56:49 +03:00
locales	Merge branch 'develop' into feature/user-quota	2023-10-04 16:56:49 +03:00
offline
scripts	Clear wrongPortalNameUrl (docker issues)	2023-10-04 14:50:54 +04:00
thirdparty
appIcon-180.png
appIcon-192.png
appIcon-512.png
favicon.ico	Web: change path for favicon.ico	2023-01-23 13:21:51 +03:00
icon.svg
manifest.json	Update manifest.json	2022-11-13 22:35:19 +03:00