pavelbannov 74d238bde8 Merge branch 'release/v1.2' into develop ... # Conflicts: # common/ASC.Common/Caching/KafkaCache.cs # common/ASC.Common/Logging/Log.cs # common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs # common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs # common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj # common/ASC.Data.Backup.Core/BackupResource.Designer.cs # common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs # common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs # common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs # common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs # common/ASC.Data.Storage/S3/S3Storage.cs # common/ASC.Notify.Textile/ASC.Notify.Textile.csproj # common/services/ASC.AuditTrail/ASC.AuditTrail.csproj # products/ASC.Files/Core/ASC.Files.Core.csproj # products/ASC.Files/Core/Core/Compress/CompressToArchive.cs # products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs # products/ASC.Files/Core/Core/Compress/CompressToZip.cs # products/ASC.Files/Core/Core/Compress/ICompress.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/Helpers/Global.cs # products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs # products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs # products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs # products/ASC.Files/Core/Utils/EntryManager.cs # web/ASC.Web.Api/ASC.Web.Api.csproj # web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs # web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs		2022-06-30 16:13:31 +03:00
..
public	fix for eb896018d4 2b19ec7997	2022-06-23 15:43:22 +03:00
src	Fix bug: the site header shifts if you open the keyboard on an android phone	2022-06-29 17:16:09 +03:00
tests	Web:Studio:Added "Portal Renaming cancel button test", "Portal Renaming save button test", "Portal Renaming error PortalNameLength test", "Portal Renaming error PortalNameIncorrect test", "Portal Renaming mobile render test".	2022-04-22 17:38:47 +03:00
.babelrc	Web: Client: init re-write to webpack 5	2020-11-27 20:40:38 +03:00
.env	Web: Clinet: Added default params to .env	2021-03-12 18:16:51 +03:00
.gitattributes	Web: Client: init re-write to webpack 5	2020-11-27 20:40:38 +03:00
.gitignore
analyse.js
codecept.conf.js	Web: Client: init e2e tests	2022-02-11 14:59:09 +03:00
Dockerfile	Web: Client: init re-write to webpack 5	2020-11-27 20:40:38 +03:00
jsconfig.json	Web: applied new import from appserver/components	2021-02-24 20:11:23 +03:00
package.json	Web: Client: add smart banner	2022-05-25 15:53:26 +03:00
steps_file.js	Web: Client: init e2e tests	2022-02-11 14:59:09 +03:00
steps.d.ts	Web: Client: init e2e tests	2022-02-11 14:59:09 +03:00
webpack.config.js	Web:Studio: delete console log	2022-05-20 10:01:45 +03:00