Commit Graph

5600 Commits

Author SHA1 Message Date
fc4f232c3e Files: fix security 2022-04-19 00:05:26 +03:00
7ed52d337c Files: refactor 2022-04-19 00:05:16 +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
5c7b7c4351 Files: added blocking merging conflict rooms 2022-04-18 14:12:16 +03:00
aa940e2437 Files: renamed 2022-04-18 14:11:10 +03:00
6a8b33f780 Files: fix error messages 2022-04-15 17:37:53 +03:00
858d93366d Files: added archive folder 2022-04-15 17:23:41 +03:00
597baeb510 Files: added archive folder 2022-04-15 17:23:31 +03:00
7f094cbf94 Files: added archive folder 2022-04-15 17:22:44 +03:00
8d4c248f2e Files: added rename room api method 2022-04-13 17:25:12 +03:00
448e0aa72e Files: CanEdtit replace to CanRename 2022-04-13 17:24:51 +03:00
020bd486e3 Files: added check for rename rooms 2022-04-13 17:24:11 +03:00
34a33e039d Files: added rename access 2022-04-13 17:23:46 +03:00
d3934f83c6 Files: added rename room dto 2022-04-13 17:23:22 +03:00
5badce9117 Files: added delete rooms api method 2022-04-13 16:01:50 +03:00
ba17f644f1 Files: added api model 2022-04-13 16:01:26 +03:00
392a1db1c0 Files: added deleting rooms 2022-04-13 15:11:32 +03:00
4ab752836b Files: added set share access for room manager 2022-04-13 14:15:07 +03:00
14bea4e71a Files: added room manager share 2022-04-13 14:13:50 +03:00
f34d4dd341 Files: block creating files in virtual rooms folder 2022-04-13 14:13:33 +03:00
67431b1cfb Files: added room manager share, added room edit security 2022-04-13 14:13:00 +03:00
080dfd2bd8 Files: rename 2022-04-12 10:33:59 +03:00
2031f32eca Files: added share template validation 2022-04-12 10:33:39 +03:00
7e9719828f Files: added aces fileter 2022-04-12 10:33:17 +03:00
296fe44c46 Files: added room manager share 2022-04-11 18:27:03 +03:00
72ab470f2b Files: added set access for rooms 2022-04-11 16:33:18 +03:00
70ec83fe06 Files: added gettings user rooms 2022-04-11 16:32:32 +03:00
efb225a3d8 Files: added creating rooms 2022-04-11 13:12:34 +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
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
c2cfdfd2d1 Files: fix 2022-03-28 17:37:28 +03:00
e7e0f5327a Merge branch 'feature/backend-refactor' into feature/log-refactor
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
2022-03-28 14:29:36 +03:00
e5229f12f5 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
#	common/ASC.Data.Storage/Configuration/StorageSettings.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	products/ASC.Files/Core/Core/ResponseStream.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
2022-03-28 12:53:15 +03:00
32186f21e7 ResponseStream: fix 2022-03-28 11:57:18 +03:00
9264302ec4 Thumbnail: async operations. Changed thumbnails format requested from editors to jpg. 1879 issue 2022-03-28 11:38:50 +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
9fbb192fd3 Test: fix packages 2022-03-24 17:00:02 +03:00
cb4d39e427 refactor 2022-03-23 19:23:25 +03:00
a13d1ccf3b Merge branch 'develop' into feature/backup 2022-03-23 18:12:01 +03:00
a857089ee6 renamed 2022-03-23 17:33:43 +03:00
079618e4e2 refactor 2022-03-23 16:08:27 +03:00
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +03:00
cee4ca3a4e Files: fix recent 2022-03-23 14:53:49 +03:00
64cd23a7bf Files: fix download as 2022-03-22 16:54:54 +03:00
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03:00
2be8ecfb22 Files: added license header 2022-03-22 13:34:46 +03:00
ee8b6eafc1 Web: Files: deleted useless folders after merge. 2022-03-22 13:22:51 +03:00