|
61e957d00a
|
Files: added /subfolders request
|
2021-06-11 14:24:01 +03:00 |
|
|
570ede7bba
|
Merge branch 'develop' into feature/11.5.2
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2021-05-31 13:32:51 +03:00 |
|
|
c8c5b49d1c
|
Files: thumbnails. 2e37dcd0
|
2021-05-30 21:52:32 +03:00 |
|
|
d8adef733c
|
ASC.Files: moved from 08a01422
|
2021-05-26 16:54:46 +03:00 |
|
|
1b730233c9
|
ElasticSearch: moved from 08a01422
|
2021-05-23 19:11:25 +03:00 |
|
|
e4f10d16cb
|
Server: Files: Controller: FilesController: Fixed model parse for delete share
|
2021-05-19 16:50:08 +03:00 |
|
|
359ead6b85
|
Files: added RecentSection, FavoritesSection
|
2021-05-13 20:25:49 +03:00 |
|
|
7baf093162
|
fix Bug 50092
|
2021-05-06 13:27:15 +03:00 |
|
|
7f059353c7
|
Files: fix thridparty opitons
|
2021-05-05 14:48:15 +03:00 |
|
|
d76239e8b4
|
Files: MoveOrCopyBatchCheck now is post method
|
2021-04-15 11:48:23 +03:00 |
|
|
9b3d0b8d39
|
Files: fixed root query
|
2021-04-13 12:46:25 +03:00 |
|
|
b574424224
|
Files: added enableExternalExt when creating file
|
2021-03-29 15:06:51 +03:00 |
|
|
0a9a1b1809
|
Files: fixed root method
|
2021-03-22 22:14:43 +03:00 |
|
|
f734a91d82
|
Files: fix SaveEditing
|
2021-03-01 14:38:55 +03:00 |
|
|
7852dac3ca
|
Files: fix saveediting
|
2021-02-26 17:07:08 +03:00 |
|
Ilya Oleshko
|
8226d9185c
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-01-29 12:38:22 +03:00 |
|
|
a9b16585ea
|
Files: fix delete
|
2021-01-29 10:17:56 +03:00 |
|
|
0246a30e84
|
Files: fix creation text file
|
2021-01-27 21:11:47 +03:00 |
|
|
64655a7da0
|
Api: modules. Added info method
|
2021-01-25 17:37:26 +03:00 |
|
|
1602fff50c
|
Files: fix insert
|
2021-01-25 12:04:25 +03:00 |
|
|
2e85d8a220
|
Files: fix insert
|
2021-01-21 10:42:23 +03:00 |
|
|
b05a809a32
|
Files: fix API SetAceLink for third-party
|
2021-01-13 11:40:11 +03:00 |
|
|
2548dba9b7
|
Web: Files: Fixed opening file on external link
|
2020-12-10 19:15:36 +03:00 |
|
Alexey Kostenko
|
149adcc372
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-07 13:44:42 +03:00 |
|
|
9ddb7c4d0e
|
Files: fix upload
|
2020-12-03 21:42:39 +03:00 |
|
|
ef92cf1cae
|
File: fix FileStreamModel
|
2020-12-03 18:15:35 +03:00 |
|
|
d39b0743fd
|
Files: fix GetSecurityInfo
|
2020-12-03 17:50:17 +03:00 |
|
|
34f8d17b84
|
Files: set files securityinfo
|
2020-12-03 17:43:33 +03:00 |
|
|
155b23f799
|
Files: GetSecurityInfo
|
2020-12-02 16:17:43 +03:00 |
|
Alexey Kostenko
|
23b209b85c
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-02 09:14:36 +03:00 |
|
|
303abad2a4
|
Files: change owner
|
2020-12-01 22:59:42 +03:00 |
|
|
8de24eae99
|
Files: openedit. AllowAnonymous
|
2020-12-01 10:20:15 +03:00 |
|
Alexey Kostenko
|
7a95d4b942
|
Web: Files: Server: Added api setacelink
|
2020-11-30 18:34:45 +03:00 |
|
|
645749fbc7
|
Files: rename ParentFolderID to FolderId.
Optimization
|
2020-11-30 16:47:26 +03:00 |
|
|
68483bc979
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
|
2020-11-13 16:03:17 +03:00 |
|
SuhorukovAnton
|
9039c810c5
|
x-www-form-urlencoded: fix
|
2020-11-11 18:36:58 +03:00 |
|
SuhorukovAnton
|
6e2860a7e5
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-10 14:51:33 +03:00 |
|
SuhorukovAnton
|
44e565ca37
|
x-www-form-urlencoded: add models
|
2020-11-10 13:41:32 +03:00 |
|
|
1490332568
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Startup.cs
|
2020-11-10 11:42:50 +03:00 |
|
|
6947185bab
|
Files: refactoring
|
2020-11-10 11:21:22 +03:00 |
|
|
2250baf7b7
|
Thirdparty: fix
|
2020-11-06 15:10:27 +03:00 |
|
SuhorukovAnton
|
855c5bc92b
|
x-www-form-urlencoded: first version
|
2020-11-06 12:03:49 +03:00 |
|
|
79ea471098
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Core.Common/BaseCommonLinkUtility.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Migration/Program.cs
# common/services/ASC.Notify/NotifyServiceLauncher.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Socket.IO.Svc/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Thumbnails.Svc/Program.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-11-04 15:22:43 +03:00 |
|
|
f39d6e83b8
|
Files: refactoring
|
2020-11-03 11:47:05 +03:00 |
|
|
2ae201ebbd
|
Files: privacy
|
2020-11-02 11:29:01 +03:00 |
|
|
6baeee6ddd
|
Files: fix startediting
|
2020-10-31 18:14:37 +03:00 |
|
|
86a15c35aa
|
Added root folder request
|
2020-10-22 17:17:20 +03:00 |
|
|
f56f231c91
|
Refactoring: scope
|
2020-10-19 22:04:07 +03:00 |
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
18ef6e7cb6
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-10-16 16:57:21 +03:00 |
|