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

59 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 Bannov
4ddf7d521c update external dependency 2023-01-19 19:05:07 +03:00
Alexey Bannov
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
SuhorukovAnton
02c9adc57b chunk backup 2022-12-14 15:55:41 +03:00
Alexey Bannov
ffde2bf1c2 s3: fixed presigned url 2022-12-09 23:46:08 +03:00
pavelbannov
ee04a7a55c removed unused dependencies 2022-11-24 14:40:13 +03:00
Alexey Bannov
9dfcd25033 backend: update dependency dll 2022-11-14 14:11:10 +03:00
Alexey Bannov
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +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
pavelbannov
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
SuhorukovAnton
09f3b29fe9 backup s3 2022-07-25 16:13:36 +03:00
pavelbannov
dd52a695e5 fix build 2022-06-27 23:18:23 +03:00
Alexey Bannov
93f637467b backend: updated packages version 2022-04-27 14:26:38 +03:00
Alexey Bannov
19cf415898 backend: updated packages version 2022-04-27 13:02:17 +03:00
MaksimChegulov
ae490c3290 System.Linq.Async package moved to share ASC.Core.Common 2022-03-21 18:32:04 +03:00
pavelbannov
07c618b23d update packages 2022-03-20 16:44:49 +03:00
MaksimChegulov
fb675dd307 updated packages 2022-03-16 16:37:56 +03:00
MaksimChegulov
2fe617f811 Storage: updated packages 2022-03-16 14:29:24 +03:00
pavelbannov
99378a027e Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
Vashchuk Nikita
5aa99ec811 Merge branch 'develop' into feature/async 
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
 2022-02-04 16:04:52 +03:00
pavelbannov
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
Vashchuk Nikita
3e03f820bb async IDataStore 2022-01-25 12:29:11 +03:00
Alexey Bannov
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
Alexey Bannov
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +03:00
SuhorukovAnton
fde636c586 net 6: update packages 2021-11-25 16:41:24 +03:00
pavelbannov
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
pavelbannov
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
SuhorukovAnton
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
pavelbannov
a84bddad3c fix 2021-08-30 19:17:57 +03:00
pavelbannov
b791586252 net6 2021-08-25 18:26:13 +03:00
pavelbannov
43de25b62a Merge branch 'develop' into feature/remove-unused-dep 
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
 2021-06-03 12:52:21 +03:00
pavelbannov
76d8ebb459 Tests moved to separate projects. 
Removed unused dependepcies
 2021-06-01 12:21:51 +03:00
SuhorukovAnton
ec56ae33a3 packages for rackspace and openstack 2021-05-18 12:01:34 +03:00
Alexey Bannov
0dbadc6394 from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
pavelbannov
f8be896241 Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
 2021-01-22 16:34:40 +03:00
pavelbannov
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
pavelbannov
a66f99f574 net5.0 2020-11-15 18:55:57 +03:00
pavelbannov
e6be6f5072 References updated 2020-10-16 10:27:44 +03:00
pavelbannov
f69281a07d References updated 2020-10-15 21:30:16 +03:00
SuhorukovAnton
bd3c14c7ec encryption: fix 2020-09-07 18:04:26 +03:00
maksim
c07be0324a ASC.Data.Storage.Migration: fix 2020-08-28 14:58:20 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
maksim
75eabe38a0 MigrateServiceClient: fix 2020-08-26 10:07:12 +03:00
maksim
280604e41d ASC.Data.Storage.Migration: adding protocol buffers and event listening 2020-08-21 11:05:27 +03:00
maksim
326d352a7c Migration: registering dependencies in program 2020-08-20 16:53:39 +03:00
pavelbannov
57454bae0c References updated 2020-06-28 16:55:21 +03:00
pavelbannov
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
pavelbannov
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
pavelbannov
bc6e1d5e9e updated dependecies 2020-02-21 11:13:01 +03:00
pavelbannov
c9939b0da1 .net core up to 3.1 2019-12-06 12:12:51 +03:00