|
7d32616524
|
Files: fix
|
2022-08-11 19:02:52 +03:00 |
|
|
a73b9cf2e4
|
Files: async fix
|
2022-08-08 23:03:58 +03:00 |
|
|
ce1917c77f
|
Async: refactoring
|
2022-08-03 17:29:20 +03:00 |
|
|
1218d31a42
|
enum generator
|
2022-07-05 16:58:11 +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 |
|
|
34d55db6a6
|
Files: added invitation by link without email, added existing user to room by link
|
2022-06-16 18:39:50 +03:00 |
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
b693779ea1
|
Merge branch 'develop' into feature/docspace-pin
|
2022-06-08 16:38:16 +03:00 |
|
|
8c56de7a26
|
moved from ddf515b8
|
2022-06-05 18:44:37 +03:00 |
|
|
2461b16468
|
fix Bug 53137: save lastModified when uploading file
|
2022-05-31 16:20:11 +03:00 |
|
|
a0f67cfe27
|
add loggers
|
2022-05-12 11:14:00 +03:00 |
|
|
ca3a49c25b
|
fix 56849
|
2022-05-05 17:07:24 +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 |
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +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 |
|
|
3380e87811
|
Files: oforms gallery manager
|
2022-04-20 10:34:33 +03:00 |
|
|
7f094cbf94
|
Files: added archive folder
|
2022-04-15 17:22:44 +03:00 |
|
|
e603b26caa
|
refactoring
|
2022-04-15 13:27:48 +03:00 |
|
|
6ecc8e7071
|
code cleanup
|
2022-04-14 22:42:15 +03:00 |
|
|
f138ff7c79
|
fixed warnings
|
2022-04-14 22:23:57 +03:00 |
|
|
900d33b2d1
|
fix copyas
|
2022-04-12 18:31:50 +03:00 |
|
|
8292795d8c
|
Files: added root folders filter
|
2022-04-10 15:30:46 +03:00 |
|
|
e78253a6b9
|
Files: added root virtual rooms folder
|
2022-04-10 14:35:43 +03:00 |
|
|
6dfb0d86d5
|
filter of files
add searchInContent in filesController's methods
|
2022-04-06 14:32:15 +03:00 |
|
|
c44ff9a190
|
fix
|
2022-04-01 17:14:14 +03:00 |
|
|
1e13f42c9c
|
Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Server/Api/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-04-01 15:17:46 +03:00 |
|
|
df8b7182b6
|
merge feature/backend-refactor
|
2022-03-29 16:12:36 +03:00 |
|
|
cfad6e7ee7
|
removed IServiceProvider
|
2022-03-28 19:51:16 +03:00 |
|
|
b4c44d1b09
|
Merge branch 'feature/backend-refactor' into feature/files-controller-refactor
|
2022-03-21 19:03:57 +03:00 |
|
|
cf8c1ba3ff
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-21 18:52:09 +03:00 |
|
|
65db98f65c
|
added new license headers
|
2022-03-15 21:00:53 +03:00 |
|
|
882507496d
|
added new routing mechanism
|
2022-03-14 13:57:59 +03:00 |
|
|
ad68b7dc60
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-10 14:15:49 +03:00 |
|
|
c9f8064224
|
Merge branch 'feature/backend-refactor' into feature/files-refactor
|
2022-03-10 12:31:05 +03:00 |
|
|
26066ccb7f
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-10 12:19:18 +03:00 |
|
|
b9719755be
|
Added ThrowIfNull
|
2022-03-09 20:15:51 +03:00 |
|
|
b1664fd2e5
|
Files: renamed helper
|
2022-03-08 20:43:47 +03:00 |
|
|
358ea18086
|
Files: divided files controller helper
|
2022-03-08 20:37:23 +03:00 |
|
|
da73ff523c
|
Files: resolve names for mapping, add mapping
|
2022-03-04 16:40:28 +03:00 |
|
|
1d398d47f6
|
Merge branch 'feature/backend-refactor' into feature/files-refactor
|
2022-03-04 13:25:12 +03:00 |
|
|
99f0f702f8
|
Files: refactor
|
2022-03-03 21:01:34 +03:00 |
|
|
c827c628c5
|
Files: separated controllers
|
2022-03-03 20:33:11 +03:00 |
|
|
0cf7b005d1
|
Merge branch 'feature/backend-refactor' into feature/asc-files-core-refactor
|
2022-03-01 17:06:27 +03:00 |
|
|
7a669f9293
|
Files: refactor
|
2022-03-01 16:10:58 +03:00 |
|
|
49a4c9e570
|
FilesCore: modet to dto
|
2022-02-28 14:06:30 +03:00 |
|
|
e6f111f651
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-25 20:16:00 +03:00 |
|