|
|
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 |
|
|
|
3d9e9eb94f
|
Files: refactor
|
2022-04-26 02:14:32 +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 |
|
|
|
e603b26caa
|
refactoring
|
2022-04-15 13:27:48 +03:00 |
|
|
|
cb2580dd50
|
refactoring
|
2022-04-15 12:08:06 +03:00 |
|
|
|
6ecc8e7071
|
code cleanup
|
2022-04-14 22:42:15 +03:00 |
|
|
|
f138ff7c79
|
fixed warnings
|
2022-04-14 22:23:57 +03:00 |
|
|
|
8d4c248f2e
|
Files: added rename room api method
|
2022-04-13 17:25:12 +03:00 |
|
|
|
5badce9117
|
Files: added delete rooms api method
|
2022-04-13 16:01:50 +03:00 |
|
Timofey Boyko
|
792bd7065f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-13 10:22:20 +03:00 |
|
|
|
4828678e03
|
merge from feature/backend-refactor
|
2022-04-12 22:04:10 +03:00 |
|
|
|
900d33b2d1
|
fix copyas
|
2022-04-12 18:31:50 +03:00 |
|
|
|
1ea6058232
|
fixed owner method
|
2022-04-12 13:21:39 +03:00 |
|
|
|
080dfd2bd8
|
Files: rename
|
2022-04-12 10:33:59 +03:00 |
|
|
|
efb225a3d8
|
Files: added creating rooms
|
2022-04-11 13:12:34 +03:00 |
|
|
|
387119f6f2
|
remove waste
|
2022-04-11 10:58:18 +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 |
|
|
|
a150b59fd9
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-05 12:16:27 +03:00 |
|
|
|
49abfdf84a
|
fix docxf templates
|
2022-04-05 12:07:46 +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 |
|
|
|
49efbc9780
|
refactoring: remove IServiceProvider
|
2022-03-31 20:32:46 +03:00 |
|
|
|
90623263e9
|
merge from feature/backend-refactor
|
2022-03-29 23:29:03 +03:00 |
|
|
|
df8b7182b6
|
merge feature/backend-refactor
|
2022-03-29 16:12:36 +03:00 |
|
|
|
4fe34215c9
|
Merge pull request #580 from ONLYOFFICE/feature/files-mapping
Feature/files mapping
|
2022-03-29 16:59:43 +04:00 |
|
|
|
cfad6e7ee7
|
removed IServiceProvider
|
2022-03-28 19:51:16 +03:00 |
|
|
|
81f3a1fb09
|
DistributedTaskQueue refactoring. set MaxThreadsCount to 1
|
2022-03-26 16:31:13 +03:00 |
|
|
|
1ee814a2ef
|
Merge branch 'feature/backend-refactor' into feature/files-controller-refactoring
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
# products/ASC.Files/Server/GlobalUsings.cs
|
2022-03-24 17:11:33 +03:00 |
|
|
|
cb4d39e427
|
refactor
|
2022-03-23 19:23:25 +03:00 |
|
|
|
a857089ee6
|
renamed
|
2022-03-23 17:33:43 +03:00 |
|
|
|
079618e4e2
|
refactor
|
2022-03-23 16:08:27 +03:00 |
|
|
|
244e345ac6
|
Merge 'feature/backend-refactor' into feature/builder-extensions
|
2022-03-22 15:57:46 +03:00 |
|
|
|
82c96d160f
|
Merge branch 'feature/backend-refactor' into feature/files-mapping
|
2022-03-22 12:09:41 +03:00 |
|
|
|
172eaa8985
|
Merge pull request #589 from ONLYOFFICE/feature/update-packages
Feature/update packages
|
2022-03-21 22:24:11 +04: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 |
|
