IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,220 Commits 40 Branches 22 Tags 420 MiB
dacebccf49
Commit Graph

25 Commits

Author SHA1 Message Date
pavelbannov
c89b8ca427 Merge branch 'master' into develop 
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
#	common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	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/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
 2023-02-07 14:31:22 +03:00
Alexey Safronov
014262ac75 Web: Removed useless api @trash call on first load 2023-01-13 17:24:13 +03:00
Alexey Safronov
ec84d70835 Web: Added count=1 to @root filter (fix speed issue) 2022-12-29 13:49:38 +03:00
Tatiana Lopaeva
113dfebaf8 Web: Added a check for the ability to move/copy to a folder. 2022-12-28 10:52:16 +03:00
gopienkonikita
294e139c49 Web: Files: fixed merge 2022-12-26 17:24:04 +03:00
gopienkonikita
ed5952894e Merge branch 'release/rc-v1.2.0' into feature/added-request-cancel 
# Conflicts:
#	packages/common/api/files/index.js
 2022-12-26 17:15:23 +03:00
Alexey Safronov
b27045eb18 Web: Replaced pure axios to request function 2022-12-26 17:08:28 +03:00
gopienkonikita
0a034ef3c6 Web: Files: added cancel request 2022-12-26 16:58:45 +03:00
Tatiana Lopaeva
c28f6943dc Web: Editor: Added onRequestReferenceData. 2022-12-16 19:34:01 +03:00
Timofey Boyko
30692753bf Web: remove logoHandlers 2022-12-15 18:41:19 +03:00
Timofey Boyko
8dd0b37250 Web:Common:API: fix for archive rooms getFolderInfo and getRoomInfo 2022-12-11 23:44:33 +03:00
Timofey Boyko
965b394789 Web:Common:API: update getFolder and getFolderInfo with getLogoIcon 2022-12-11 22:55:21 +03:00
TimofeyBoyko
45675c5dc1 Web:Common:Api: add excludeSubject at files filter 2022-09-16 18:27:28 +03:00
TimofeyBoyko
ccf9386c8e Web:Common:Api: fix files filter 2022-09-12 12:26:37 +03:00
TimofeyBoyko
492d1bd682 Web:Common:Api: add searchInContent for file filter 2022-09-12 11:52:55 +03:00
Alexey Safronov
dc235a5bc9
Merge branch 'develop' into feature/create-room 2022-08-29 17:15:20 +03:00
gopienkonikita
8abc7f4095 Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 09:51:34 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
mushka
b8637a31c1 added new isRoomsStorage param to saveThirdparty api call 2022-08-24 19:35:34 +03:00
gopienkonikita
e5e1d966d1 Web: Files: restored paging, added withPaging parameter 2022-08-19 12:37:30 +03:00
gopienkonikita
2e2b701df0 Web: Common: changed DEFAULT_PAGE_COUNT 2022-08-17 17:54:35 +03:00
gopienkonikita
774b445c16 Web: Files: fixed removeFiles, fixed filterTotal 2022-08-16 16:16:33 +03:00
Tatiana Lopaeva
6c2b49470c WEb: Fixed after merge. 2022-08-12 13:25:29 +03:00
Tatiana Lopaeva
4463fc6e8f Merge branch 'develop' into feature/docspace-backup 
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/sub-components/ButtonContainer.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectConnectionContainer.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectThirdPartyConnection.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/FormConnection.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/GetThirdPartyStoragesOptions.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/InputsMethods.js
#	packages/common/components/Loaders/AutoBackupLoader/StyledAutoBackup.js
#	packages/common/components/Loaders/AutoBackupLoader/index.js
#	packages/common/components/Loaders/DataBackupLoader/StyledDataBackup.js
#	packages/common/components/Loaders/DataBackupLoader/index.js
#	packages/common/components/Loaders/RestoreBackupLoader/StyledRestoreBackup.js
#	packages/common/components/Loaders/RestoreBackupLoader/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js
#	products/ASC.Files/Server/GlobalUsings.cs
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/StyledBackup.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/AmazonSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/GoogleCloudSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/RackspaceSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/SelectelSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyStorageModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/AmazonStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/GoogleCloudStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/RackspaceStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/SelectelStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyResourcesModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyStoragesModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/AmazonStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/GoogleCloudStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/RackspaceStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/SelectelStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
#	web/ASC.Web.Client/src/store/BackupStore.js
 2022-08-11 17:10:37 +03:00
Alexey Safronov
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00