ff7eeb0940
remove waste in asc.files
2022-09-08 10:57:49 +03:00
07d909358a
Files: removed unnecessary
2022-09-07 18:24:27 +03:00
fb4e996196
Merge branch 'develop' into feature/room-security
2022-09-06 13:36:03 +03:00
31297798aa
refactor
2022-09-06 13:32:37 +03:00
1d75a5adc3
refactor
2022-09-06 13:26:08 +03:00
1a1b2c68b0
backend: refactoring start application
2022-09-06 11:29:01 +03:00
cf88dc8243
Files: changed to get room information
2022-09-05 14:27:24 +03:00
45339de198
Files: added gettting shares for rooms
2022-09-05 13:12:40 +03:00
7895a214c9
Merge pull request #780 from ONLYOFFICE/feature/private-virtual-rooms
...
Feature/private virtual rooms
2022-09-01 19:34:12 +04:00
605aee5529
Merge branch 'develop' into feature/security-history-audit
2022-08-30 11:55:19 +05:00
3db342ffec
Merge branch 'develop' into feature/private-virtual-rooms
2022-08-29 17:39:57 +03:00
e3e47364e0
Merge branch 'develop' into feature/security-history-audit
2022-08-29 13:36:09 +05:00
d11e228792
Merge branch 'develop' into bugfix/sharpbox
2022-08-29 10:27:50 +03:00
b4a5fb253f
Files: fix rename for SharpBox, SharePoint providers
2022-08-26 13:08:03 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup
2022-08-25 16:34:59 +03:00
0c596956f6
Merge branch 'develop' into feautre/private-virtual-rooms
2022-08-25 15:30:11 +03:00
6ee5cdb0c3
Merge branch 'develop' into feature/room-filter
2022-08-25 10:23:24 +03:00
7f4838901a
fix after merge
2022-08-24 17:30:06 +03:00
0daea49132
Merge branch 'develop' into feature/private-virtual-rooms
2022-08-24 17:12:13 +03:00
58b48df3ab
Files: added folders only filter for rooms
2022-08-23 17:22:50 +03:00
34232bc735
Files: removed oformservice
2022-08-23 16:34:54 +03:00
53ee8e9e15
Files: fix security
2022-08-23 15:18:37 +03:00
d4eefc6145
Files: fixed optional params
2022-08-19 15:47:11 +03:00
8b6821d410
Files: fixed .format folders methods
2022-08-19 14:57:51 +03:00
2b6c4b127a
Merge branch 'develop' into feature/docspace-backup
...
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Server/Api/ThirdpartyController.cs
2022-08-17 13:58:00 +03:00
7d32616524
Files: fix
2022-08-11 19:02:52 +03:00
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
05d5421ebc
fix
2022-08-09 17:11:40 +03:00
baaec9dcef
Merge branch 'develop' into feature/async-fix
...
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
2022-08-09 16:27:35 +03:00
a73b9cf2e4
Files: async fix
2022-08-08 23:03:58 +03:00
870c3cf3c4
warm up services
2022-08-08 19:25:22 +03:00
9149d08937
Files: async
2022-08-04 13:47:18 +03:00
ce1917c77f
Async: refactoring
2022-08-03 17:29:20 +03:00
7b40920552
Chinese (Traditional, Taiwan) empty file templates
2022-08-02 17:41:42 +03:00
3d531e653d
Files: update docstore submodule ( b8a2cf5292
)
...
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
2022-08-02 17:41:04 +03:00
fe5c8b0b13
fixed tests and tools
2022-07-29 20:23:19 +03:00
6fd385e026
Merge branch 'develop' into feature/docspace-backup
2022-07-29 11:13:42 +03:00
dba122eb96
Common, files: added dbcontext pool
2022-07-28 21:00:49 +03:00
8acb550b08
files helpers moved to ASC.Files.Core
2022-07-25 14:03:31 +03:00
5877abf2e1
thirdparty backup: single connect
2022-07-24 22:19:36 +03:00
5762bf1b04
Files: openedit method extended
2022-07-22 17:54:14 +03:00
0a203dd532
Files: added new methods to api
2022-07-22 15:55:32 +03:00
7f7b636d9b
fix get thirdparty/backup
2022-07-22 13:01:23 +03:00
67f5146d3e
Merge branch 'develop' into feature/private-virtual-rooms
2022-07-22 11:10:23 +03:00
Artem Tarasov
345dad709c
Merge branch 'develop' into feature/doceditor-ssr
2022-07-21 16:02:48 +03:00
987788bab7
Files: added creating private thirdparty room
2022-07-21 12:38:23 +03:00
77d311b636
Merge branch 'develop' into feature/doceditor-ssr
2022-07-21 11:41:42 +03:00
TimofeyBoyko
7a9114f562
Merge branch 'develop' into feature/virtual-rooms-page
2022-07-20 14:29:04 +03:00
6ffa21a919
fix
2022-07-20 14:12:08 +03:00
0250a43ba6
thirdparty backup
2022-07-19 14:56:22 +03:00
1d0db523a8
Merge branch 'develop' into feature/rooms-filter
2022-07-18 17:27:57 +03:00
cab55d68f3
Files: fix filter, refactor, removed unnecessary
2022-07-18 17:11:50 +03:00
Artem Tarasov
10f2cde731
Merge branch 'develop' into feature/doceditor-ssr
...
# Conflicts:
# .gitignore
2022-07-18 17:05:53 +03:00
TimofeyBoyko
bfc1422ba7
Merge branch 'develop' into feature/virtual-rooms-page
2022-07-14 06:01:51 +03:00
c03e1a443a
Files: added restrictions on sharing for private rooms
2022-07-13 16:33:44 +03:00
e7831d9b94
Files: moved parameter from body to query
2022-07-13 11:47:15 +03:00
a2129001c9
Files: added withoutTags, withoutMe parameters, refactor
2022-07-12 19:25:34 +03:00
1face3ea40
Files: added searching rooms without tags only
2022-07-11 17:13:30 +03:00
TimofeyBoyko
95e03a49d2
Merge branch 'develop' into feature/virtual-rooms-page
2022-07-11 14:55:50 +03:00
Artem Tarasov
55198d0e7f
Merge branch 'develop' into feature/doceditor-ssr
...
# Conflicts:
# web/ASC.Web.Editor/src/i18n.js
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
2022-07-10 11:23:44 +03:00
TimofeyBoyko
c8feb7899b
Merge branch 'develop' into feature/virtual-rooms-page
2022-07-08 12:32:26 +03:00
b8a2cf5292
Files: update docstore submodule
...
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
2022-07-07 18:11:42 +03:00
c78370b5b1
Merge branch 'develop' into feature/private-virtual-rooms
2022-07-07 17:58:04 +03:00
2bc07e0a1d
Files: added DeleteAfter for archiving/unarchiving rooms
2022-07-07 17:52:20 +03:00
f52162827e
Files: added DeleteAfter for rooms
2022-07-07 16:20:44 +03:00
0b21b748fc
Merge branch 'develop' into feature/private-virtual-rooms
2022-07-07 11:28:57 +03:00
aeac8613a8
Merge branch 'develop' into features/enum_generator
2022-07-05 17:22:43 +03:00
1218d31a42
enum generator
2022-07-05 16:58:11 +03:00
7e34e45371
ElasticSearch: disabled by default
2022-07-01 12:53:18 +03:00
TimofeyBoyko
3e07ef1efc
Merge branch 'develop' into feature/virtual-rooms-page
2022-07-01 10:09:47 +03:00
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
35ab5a3531
fix order
2022-06-29 19:43:29 +03:00
667cea2ee9
Files: fix rooms parent folder
2022-06-29 15:47:52 +03:00
2c434e2d92
Files: fix security, added private room check
2022-06-23 18:14:57 +03:00
1692bd315c
Files: added private
2022-06-23 18:12:54 +03:00
f2da6fc55c
Merge pull request #693 from ONLYOFFICE/feature/docspace
...
Feature/docspace
2022-06-22 11:55:36 +04:00
aad8a92b4c
RoomInvite replaced by LinkInvite
2022-06-21 20:33:05 +03:00
b30ec3c1bd
Files: added room api docs
2022-06-21 18:43:54 +03:00
34cb63fd3f
fix
2022-06-20 17:23:32 +03:00
57916d46ba
Files: removed unnecessary, refactor
2022-06-20 14:39:08 +03:00
44747e837a
Files: tag id replaced with tag name
2022-06-20 14:30:49 +03:00
e6602a22ab
Files: fix copyas
2022-06-20 13:21:40 +03:00
e68ac70005
Merge branch 'develop' into feature/docspace
2022-06-20 12:15:08 +03:00
e2cee2c2fc
Merge branch 'release/v1.2' into develop
...
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
8ea04bcc81
Merge branch 'develop' into feature/12.0
...
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
2022-06-17 19:19:00 +03:00
3684775829
Files: security fix
2022-06-17 12:27:07 +03:00
ff6a403c3c
Files: refactor
2022-06-17 11:22:55 +03:00
2b8b7c9898
Files: added permission check for link generation
2022-06-17 10:59:03 +03:00
1f65ea35a7
Files: removed unnecessary
2022-06-17 10:52:32 +03:00
34d55db6a6
Files: added invitation by link without email, added existing user to room by link
2022-06-16 18:39:50 +03:00
430542b2ea
moved from ddf515b8
2022-06-16 11:35:24 +03:00
c9fb0d3dac
moved from ddf515b8
2022-06-16 11:13:53 +03:00
c37af416da
Files: fix 404
2022-06-15 10:41:59 +03:00
77ecf6f988
Files: fix
2022-06-14 18:12:37 +03:00
7194fec848
Files: fix
2022-06-14 13:30:12 +03:00
35bebe49f9
moved from ddf515b8
2022-06-14 11:11:41 +03:00
1b6d96400c
Files: changed filtering rooms by types
2022-06-09 20:11:12 +03:00
e2ba706d71
Fix after merge
2022-06-08 16:38:34 +03:00
b693779ea1
Merge branch 'develop' into feature/docspace-pin
2022-06-08 16:38:16 +03:00
397cde0a3b
Files: added pin/unpin, fix tags
2022-06-07 19:07:55 +03:00
8c56de7a26
moved from ddf515b8
2022-06-05 18:44:37 +03:00
57df81aa76
Files: added logo audit, fix
2022-06-03 01:27:56 +03:00
848751220c
Files: added logos for rooms
2022-06-02 21:41:16 +03:00
b81d3ff507
Files: fix routing
2022-05-31 16:49:54 +03:00
2461b16468
fix Bug 53137: save lastModified when uploading file
2022-05-31 16:20:11 +03:00
73364c1fba
Files: refactor
2022-05-30 14:32:00 +03:00
2a7853bf5b
Files: added creating thirdparty rooms
2022-05-30 14:31:30 +03:00
e704983452
Filex: fix controller
2022-05-29 22:36:28 +03:00
e2e8f3fce9
Merge branch 'feature/docspace-tags' into feature/docspace-thirdparty
2022-05-26 16:39:19 +03:00
3123bbd187
Files: added tags filtering
2022-05-26 16:37:31 +03:00
518fe17d14
refactor
2022-05-26 14:43:56 +03:00
03eaaf4b19
Files: added thirdparty rooms connection
2022-05-26 13:13:25 +03:00
a66c03aa86
Merge branch 'develop' into feature/logger-refactoring
...
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
2022-05-24 23:13:57 +03:00
02570e12cf
Merge branch 'develop' into feature/cluster-services
2022-05-24 17:24:25 +03:00
13ad4381f7
Api: removed CustomHttpMethodAttribute
...
added AllowNotPaymentAttribute
2022-05-23 18:48:23 +03:00
5fa9c839e6
Files: fix
2022-05-23 12:29:14 +03:00
c9357da3b0
Files: added deleting tags, fix
2022-05-23 12:25:33 +03:00
7b6abe81a2
Files: added custom tags
2022-05-20 19:26:13 +03:00
75da995099
Merge branch 'develop' into feature/logger-refactoring
2022-05-20 17:01:51 +03:00
36855d656f
remove application/x-www-form-urlencoded
2022-05-17 12:29:24 +03:00
2e33540486
Merge branch 'feature/docspace' into feature/docspace-links
2022-05-17 11:53:37 +03:00
6c45bb0632
Merge branch 'develop' into feature/docspace
2022-05-17 11:50:56 +03:00
d0525e298c
thumbnails, notify, telegram: migrate from ICacheNotify to EventBus
2022-05-13 22:14:00 +03:00
025d13557d
added a secure link to invite to the portal
2022-05-13 19:25:28 +03:00
cb024b0bbb
revert 85dffc552f
0c9147b815
2022-05-13 09:56:16 +03:00
Timofey Boyko
0c9147b815
Web:Components:Themes: fix error for connected clouds page
2022-05-12 19:07:50 +03:00
Timofey Boyko
85dffc552f
Web:Components:Themes: add color to connected clouds for base theme
2022-05-12 16:16:50 +03:00
d6a039b8cd
Files: updated docxf, oform, az. added gl-ES, tr
2022-05-12 13:38:23 +03:00
a0f67cfe27
add loggers
2022-05-12 11:14:00 +03:00
ca3a49c25b
fix 56849
2022-05-05 17:07:24 +03:00
68f949f2e7
Files: added link generation
2022-05-05 15:31:04 +03:00
4a773679e1
fix-tests: rework files tests
...
-rework tests (use httpClient)
-fix migration
-add description
-union similar tests
-add random port for asc.Files
-add time to db name
-change TestCaseSource to TestCase
2022-04-28 18:55:41 +03:00
2efbdddf15
Files: fix
2022-04-28 16:00:05 +03:00
503672e6b2
Merge branch 'develop' into feature/docspace
2022-04-28 15:45:09 +03:00
b6fe254379
Files: docspace default enabled
2022-04-28 12:40:17 +03:00
89059cf32e
Structured Logging
2022-04-28 12:15:33 +03:00
13bbce8ea4
Custom logger replaced with Microsoft.Extensions.Logging
2022-04-26 20:53:48 +03:00
3d9e9eb94f
Files: refactor
2022-04-26 02:14:32 +03:00
97b45d3bd5
ILog: refactoring
2022-04-25 21:02:18 +03:00
e38fcc1acb
Files: refactor api, added query parameters
2022-04-25 00:08:01 +03:00
70006499f1
Files: removed unnecessary multipart api methods
2022-04-22 11:33:08 +03:00
639c6fc7cc
Files: removed unnecessary
2022-04-22 11:28:57 +03:00
9eba173a44
Merge branch 'develop' into feature/backend-refactor
...
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2022-04-21 22:36:29 +03:00
1dff9e18c4
Merge branch 'develop' into feature/backend-refactor
...
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
bc64ff4cf7
Files: docspace check
2022-04-20 11:26:31 +03:00
3380e87811
Files: oforms gallery manager
2022-04-20 10:34:33 +03:00
a1df51bb5c
Files: added security api methods for rooms
2022-04-19 00:05:52 +03:00
57ae539f8b
Files: added api methods for form
2022-04-18 14:33:11 +03:00
678e1c2ada
Files: refactor
2022-04-18 14:12:29 +03:00
7f094cbf94
Files: added archive folder
2022-04-15 17:22:44 +03:00