|
|
f0e227731f
|
Fixed loading products, lazy loading webitemmanager
|
2021-01-26 12:29:50 +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 |
|
|
|
036ddc87c3
|
5.0.2
|
2021-01-22 16:49:38 +03:00 |
|
|
|
f8be896241
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2021-01-22 16:34:40 +03:00 |
|
|
|
2e85d8a220
|
Files: fix insert
|
2021-01-21 10:42:23 +03:00 |
|
|
|
2848c39c57
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-14 10:14:46 +03:00 |
|
|
|
144a86fca7
|
Files: fix Deserialize
|
2021-01-13 13:49:52 +03:00 |
|
|
|
b05a809a32
|
Files: fix API SetAceLink for third-party
|
2021-01-13 11:40:11 +03:00 |
|
|
|
f40b347289
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-30 19:42:59 +03:00 |
|
|
|
fa7c2bf9f1
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-29 18:37:28 +03:00 |
|
Vladislav Makhov
|
e6cf51575a
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-29 16:08:08 +03:00 |
|
|
|
43bd3f6541
|
Files: openedit. EncryptionKeys
|
2020-12-29 16:04:50 +03:00 |
|
Vladislav Makhov
|
737605b01e
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/en/translation.json
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/ru/translation.json
|
2020-12-28 11:34:26 +03:00 |
|
|
|
2fdcbee8ef
|
Files: pass CallbackUrl. Fix trackedit.
|
2020-12-25 23:25:37 +03:00 |
|
Diana
|
aa667a02ef
|
fix
|
2020-12-24 03:21:29 +03:00 |
|
Diana
|
fada5e278b
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests
|
2020-12-17 13:20:52 +03:00 |
|
Vladislav Makhov
|
b748693676
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Components/src/components/row/index.js
|
2020-12-15 11:00:54 +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 |
|
|
|
1675896294
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
|
2020-12-04 11:59:10 +03:00 |
|
Vladislav Makhov
|
af6a1a8c73
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-04 08:16: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 |
|
Vladislav Makhov
|
3064eb302b
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# web/ASC.Web.Common/src/pages/login/index.js
|
2020-12-03 09:59:20 +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 |
|
|
|
228c304211
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-01 12:29:36 +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 |
|
Vladislav Makhov
|
813c9c4b1d
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-11-30 15:16:49 +03:00 |
|
|
|
40546da35d
|
fix create file
|
2020-11-26 20:30:57 +03:00 |
|
|
|
75fce656f0
|
Merge branch 'develop' into feature/dotnet5
|
2020-11-17 11:31:14 +03:00 |
|
|
|
7866ba1212
|
Files: removed dependencies
|
2020-11-16 21:30:33 +03:00 |
|
|
|
a66f99f574
|
net5.0
|
2020-11-15 18:55:57 +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 |
|
|
|
85e7eb38be
|
Privacy:getkeys method
|
2020-11-11 15:50:03 +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 |
|
|
|
37fa37f473
|
Files: fix autofac
|
2020-11-06 17:54:48 +03:00 |
|
|
|
2250baf7b7
|
Thirdparty: fix
|
2020-11-06 15:10:27 +03:00 |
|
SuhorukovAnton
|
2a98447b82
|
x-www-form-urlencoded: update PrivacyRoomController
|
2020-11-06 13:30:57 +03:00 |
|
SuhorukovAnton
|
8b5a34d98f
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-06 12:05:30 +03:00 |
|
SuhorukovAnton
|
855c5bc92b
|
x-www-form-urlencoded: first version
|
2020-11-06 12:03:49 +03:00 |
|
|
|
e9b5992600
|
Fix PrivacyRoomController
|
2020-11-05 18:42:23 +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 |
|
|
|
7e828b5643
|
Autofac: fix
|
2020-11-02 19:27:08 +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 |
|
|
|
e9a9b320e8
|
Scope: refactoring. Notify, People
|
2020-10-27 18:34:22 +03:00 |
|
|
|
367c93fd91
|
Refactoring: scope
|
2020-10-22 20:57:18 +03:00 |
|
|
|
949cc1bd56
|
Startup revert
|
2020-10-22 17:32:53 +03:00 |
|
|
|
86a15c35aa
|
Added root folder request
|
2020-10-22 17:17:20 +03:00 |
|
|
|
3ddb202c56
|
Scope: refactoring
|
2020-10-21 14:52:44 +03:00 |
|
|
|
6f25e2e83e
|
Refacoring: scope
|
2020-10-21 14:12:08 +03:00 |
|
|
|
f56f231c91
|
Refactoring: scope
|
2020-10-19 22:04:07 +03:00 |
|
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
|
3a29e9970f
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# products/ASC.Files/Server/Startup.cs
|
2020-10-18 22:52:24 +03:00 |
|
|
|
181ac04fd8
|
DI: register fix
|
2020-10-18 19:34:30 +03:00 |
|
|
|
a4eb45f1ab
|
Scope: refactoring
|
2020-10-18 19:03:14 +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 |
|
|
|
5eed00dd28
|
Removed sq bugs and code smells
|
2020-10-16 16:21:59 +03:00 |
|
|
|
e6be6f5072
|
References updated
|
2020-10-16 10:27:44 +03:00 |
|
|
|
f69281a07d
|
References updated
|
2020-10-15 21:30:16 +03:00 |
|
|
|
4a0a683c68
|
fix
|
2020-10-14 12:11:04 +03:00 |
|
|
|
668cb3e893
|
Merge branch 'master' into feature/files
|
2020-10-13 15:27:31 +03:00 |
|
|
|
9968873305
|
Merge branch 'master' into feature/fix_API_return
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-10-13 13:33:24 +03:00 |
|
|
|
02f39a9c71
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# web/ASC.Web.Core/Files/FileUtility.cs
|
2020-10-13 12:52:28 +03:00 |
|
|
|
b4a0a302e6
|
Files: fix di
|
2020-10-13 10:28:13 +03:00 |
|
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
|
43b9c33979
|
fix formating
|
2020-10-12 19:23:15 +03:00 |
|
|
|
e01ee037f2
|
Merge branch 'master' into feature/fix-messages
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-10-09 15:40:44 +03:00 |
|
SuhorukovAnton
|
370400e4c0
|
fix_API_return: first version
|
2020-10-09 13:05:48 +03:00 |
|
|
|
3ca0990715
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-10-08 19:01:09 +03:00 |
|
|
|
573dc8922b
|
Merge branch 'master' into feature/schema
# Conflicts:
# common/ASC.Common/DIHelper.cs
|
2020-10-08 11:42:57 +03:00 |
|
|
|
41eaf5d885
|
Files: api. AddToRecent
|
2020-10-07 17:31:17 +03:00 |
|
Diana
|
04ee542f22
|
fix migrations, models, added migration and model schema TelegramDbContext
|
2020-10-01 20:08:55 +03:00 |
|
|
|
6bad98e277
|
Merge branch 'master' into feature/schema
# Conflicts:
# config/appsettings.json
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
|
2020-10-01 12:25:07 +03:00 |
|
|
|
0bd5099c00
|
Removed Migrations()
|
2020-10-01 11:39:21 +03:00 |
|
SuhorukovAnton
|
edbc0f247c
|
fix-messages: IDE0022
|
2020-09-30 17:47:42 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
Diana
|
9e32aaca03
|
migration process
|
2020-09-29 20:17:06 +03:00 |
|
SuhorukovAnton
|
135a845eaf
|
fix-messages: IDE0063
|
2020-09-29 12:16:07 +03:00 |
|
SuhorukovAnton
|
2d34d70a4e
|
fix-messages: IDE0051 and IDE0052
|
2020-09-29 11:57:37 +03:00 |
|
|
|
c593620865
|
Files: fix count
|
2020-09-28 13:41:48 +03:00 |
|
|
|
2c1d473314
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-09-28 12:29:33 +03:00 |
|
|
|
89df700fb1
|
Files: fix
|
2020-09-25 13:47:21 +03:00 |
|
|
|
075798b90c
|
moved from release/11 4414f77b
|
2020-09-22 17:17:17 +03:00 |
|
|
|
d30026b82f
|
Merge branch 'master' into feature/files
|
2020-09-08 15:20:05 +03:00 |
|
|
|
f464e031b8
|
Notify: fix
|
2020-09-08 11:42:13 +03:00 |
|
|
|
29d9f21d05
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# web/ASC.Web.Core/Files/DocumentService.cs
|
2020-08-31 17:45:57 +03:00 |
|
|
|
f5348c3ccd
|
Files: settings. Added settings, forcesave, thirdparty
|
2020-08-31 15:41:28 +03:00 |
|
Diana
|
7466aed406
|
choice between mysql and postgresql
|
2020-08-28 00:45:07 +03:00 |
|
|
|
17c4cf02fc
|
Merge branch 'master' into feature/files
|
2020-08-27 18:06:05 +03:00 |
|
|
|
be5abb8cd3
|
Files: added settings methods
|
2020-08-27 18:05:21 +03:00 |
|
|
|
fd5a9a74f0
|
Merge branch 'master' into feature/files
|
2020-08-20 17:51:14 +03:00 |
|
|
|
4501d3229a
|
Nuget: replaced thirdparty
|
2020-08-20 17:50:08 +03:00 |
|
|
|
15ba6828c5
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-08-20 12:43:12 +03:00 |
|
|
|
f00a964c32
|
Merge branch 'master' into feature/private
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-08-14 17:19:36 +03:00 |
|
maksim
|
c7a3fa85f2
|
Thirdparty: remove reference
|
2020-08-14 16:16:48 +03:00 |
|
maksim
|
c24bdfbbba
|
Merge branch 'master' into feature/thirdparty
|
2020-08-14 16:01:55 +03:00 |
|
maksim
|
4a29a69761
|
feature custom nuget server
|
2020-08-14 13:48:34 +03:00 |
|
|
|
d6ff0d6a44
|
Merge branch 'master' into feature/files
|
2020-08-12 18:26:28 +03:00 |
|
|
|
6782269c7f
|
Files: lock file
|
2020-08-12 18:13:52 +03:00 |
|
maksim
|
6782b16413
|
fix: replacing projectreference with packagereference
|
2020-08-12 13:34:19 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
|
34c2252b25
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-08-02 22:31:52 +03:00 |
|
|
|
6253b151e1
|
fix ChangeHistory, UpdateFile, added UpdateComment
|
2020-08-02 21:48:58 +03:00 |
|
|
|
0231e60cc7
|
Merge branch 'master' into feature/files
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
# web/ASC.Web.Components/src/index.js
|
2020-07-28 17:34:46 +03:00 |
|
|
|
585d98f8f4
|
Files: core. replace
|
2020-07-28 15:45:14 +03:00 |
|
|
|
d094546147
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2020-07-17 17:48:50 +03:00 |
|
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
|
8d0d5fd908
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# web/ASC.Web.Components/package.json
|
2020-07-16 14:41:32 +03:00 |
|
|
|
ff41b28a64
|
DI: files fix
|
2020-07-16 12:08:20 +03:00 |
|
|
|
576e8a6de0
|
Files: revert
|
2020-07-16 00:49:25 +03:00 |
|
|
|
ddf5aa6f19
|
Files: additional logging
|
2020-07-15 23:18:35 +03:00 |
|
|
|
531b66875f
|
Files: fix
|
2020-07-15 18:27:46 +03:00 |
|
|
|
9ee887d270
|
DocumentService log error
|
2020-07-15 18:06:35 +03:00 |
|
|
|
414e17ac1f
|
DocumentService log error
|
2020-07-15 17:40:58 +03:00 |
|
SuhorukovAnton
|
83a88d0240
|
Merge branch 'master' into feature/ASC.Files.Core
|
2020-07-15 17:38:40 +03:00 |
|
|
|
a54be3b64c
|
Merge branch 'master' into feature/files
|
2020-07-15 16:57:14 +03:00 |
|
|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +03:00 |
|
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +03:00 |
|
SuhorukovAnton
|
5bf0bd22b6
|
ASC.Files.Core: first version
|
2020-07-14 13:03:53 +03:00 |
|
|
|
88e932a0a7
|
Merge branch 'master' into feature/files
|
2020-07-13 16:46:42 +03:00 |
|
|
|
a347f4e4f3
|
fix
|
2020-07-13 16:18:31 +03:00 |
|
|
|
a822f9b349
|
Files: fix
|
2020-07-13 15:57:39 +03:00 |
|
|
|
dfd8bbfdb8
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-13 15:28:11 +03:00 |
|
|
|
064160a1ea
|
Files: onedrive
|
2020-07-10 18:37:02 +03:00 |
|
|
|
45678da8e5
|
Merge branch 'master' into feature/files
|
2020-07-10 14:58:37 +03:00 |
|
|
|
56df9a98ef
|
Files: resources
|
2020-07-10 14:57:42 +03:00 |
|
SuhorukovAnton
|
2925ff25b4
|
api-defaultvalue: add System.Text.Json
|
2020-07-10 13:35:24 +03:00 |
|
|
|
c9040bd1e3
|
Files: fix CompleteVersion
|
2020-07-09 22:26:00 +03:00 |
|
SuhorukovAnton
|
f8e42cbd08
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 22:06:08 +03:00 |
|
SuhorukovAnton
|
28e70e91f6
|
api-defaultvalue: add JsonPropertyNames
|
2020-07-09 18:37:36 +03:00 |
|
|
|
71c267939d
|
Files: fix names and Serializers
|
2020-07-09 12:02:44 +03:00 |
|
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
SuhorukovAnton
|
88cad55450
|
api-defaultvalue: delete DataMembers
|
2020-07-07 12:59:12 +03:00 |
|
SuhorukovAnton
|
a43c14dcb3
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-07 12:38:35 +03:00 |
|
SuhorukovAnton
|
00558dd95f
|
general-startup: fix
|
2020-07-06 10:56:17 +03:00 |
|
|
|
6cc564b716
|
Merge branch 'master' into feature/files
|
2020-07-04 12:47:53 +03:00 |
|
|
|
2b4d853b77
|
Files: fix
|
2020-07-04 12:46:01 +03:00 |
|
|
|
81ace5028d
|
Merge branch 'master' into feature/files
|
2020-07-03 18:34:27 +03:00 |
|
|
|
6c0b91a836
|
Files: converter fix
|
2020-07-03 18:33:40 +03:00 |
|
|
|
9a2c382dfc
|
Merge branch 'master' into feature/files
|
2020-07-03 17:47:29 +03:00 |
|
|
|
b9b938cdf8
|
Files: fix convert
|
2020-07-03 17:47:01 +03:00 |
|
|
|
c318086fca
|
Merge branch 'master' into feature/files
|
2020-07-03 17:37:49 +03:00 |
|
|
|
9440367b3a
|
FileConvert: fix
|
2020-07-03 17:37:14 +03:00 |
|
|
|
7cba451f89
|
Merge branch 'master' into feature/files
|
2020-07-03 14:49:26 +03:00 |
|
|
|
98b007fe35
|
Files: fix CheckConversion
|
2020-07-03 14:48:56 +03:00 |
|
|
|
be99a345f7
|
Merge branch 'master' into feature/files
|
2020-07-03 14:24:47 +03:00 |
|
|
|
13efc06874
|
Files: fix
|
2020-07-03 14:19:45 +03:00 |
|
|
|
2b6ef1e745
|
Merge branch 'master' into feature/files
|
2020-07-03 13:37:09 +03:00 |
|
|
|
ded7034ba7
|
Files: fix convert
|
2020-07-03 13:36:31 +03:00 |
|
|
|
151ec90f4c
|
Merge branch 'master' into feature/files
|
2020-07-03 11:35:09 +03:00 |
|
|
|
479a4e5896
|
Files: additional logging
|
2020-07-03 11:34:36 +03:00 |
|
SuhorukovAnton
|
6647217371
|
api-defaultvalue: fix
|
2020-07-02 23:51:18 +03:00 |
|
|
|
c9a64ca377
|
Added NullIfDefault
|
2020-07-02 18:15:52 +03:00 |
|
SuhorukovAnton
|
5737eca3ad
|
api-defaultvalue: fix
|
2020-07-02 15:50:31 +03:00 |
|
SuhorukovAnton
|
02729b9b37
|
api-defaultvalue: fix
|
2020-07-02 10:27:25 +03:00 |
|
SuhorukovAnton
|
cb0cbf99a4
|
api-defaultvalue: fix
|
2020-07-02 10:24:01 +03:00 |
|
SuhorukovAnton
|
d185a6143c
|
api-defaultvalue: fix
|
2020-07-02 10:20:41 +03:00 |
|
SuhorukovAnton
|
0ec331db76
|
api-defaultvalue: fix
|
2020-06-30 16:56:38 +03:00 |
|
SuhorukovAnton
|
4ba2223fa1
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-06-29 14:20:24 +03:00 |
|
SuhorukovAnton
|
06cc93223f
|
api-defaultvalue-fix
|
2020-06-29 14:16:23 +03:00 |
|
SuhorukovAnton
|
6869d7c8d1
|
api-defaultvalue: fix
|
2020-06-29 13:37:53 +03:00 |
|
|
|
87f85fdefe
|
Merge branch 'master' into feature/files
|
2020-06-29 09:53:07 +03:00 |
|
|
|
da91c97809
|
Files: added new for subfolder
|
2020-06-28 19:02:09 +03:00 |
|
|
|
90aad433a0
|
Files: fix getshare
|
2020-06-28 18:45:01 +03:00 |
|
|
|
57454bae0c
|
References updated
|
2020-06-28 16:55:21 +03:00 |
|
SuhorukovAnton
|
51be59740e
|
api-defaultvalue
|
2020-06-26 15:48:41 +03:00 |
|
SuhorukovAnton
|
fc4f073a9b
|
api-defaultvalue: fix
|
2020-06-26 12:59:39 +03:00 |
|
SuhorukovAnton
|
debb0d2193
|
api-defaultvalue: first version
|
2020-06-26 12:53:26 +03:00 |
|
|
|
5319b905e6
|
Merge branch 'master' into feature/files
|
2020-06-26 10:54:17 +03:00 |
|
|
|
3a00f3e9d0
|
Files: fix GetNewItems
|
2020-06-26 10:45:24 +03:00 |
|
|
|
cfdc6d495e
|
Merge branch 'master' into feature/files
|
2020-06-26 09:46:04 +03:00 |
|
|
|
83b05c5b64
|
Files: added news
|
2020-06-25 20:17:24 +03:00 |
|
|
|
d14313c6c1
|
References updated
|
2020-06-25 14:38:34 +03:00 |
|
|
|
f4e8912cc2
|
Merge branch 'master' into feature/files
|
2020-06-25 12:34:11 +03:00 |
|
|
|
0d2dc08ef8
|
Files: added new
|
2020-06-25 12:31:35 +03:00 |
|
Ilya Oleshko
|
dacde04f39
|
Merge branch 'master' into feature/files
|
2020-06-23 08:23:07 +03:00 |
|
|
|
dedd754875
|
Merge pull request #39 from ONLYOFFICE/feature/feed
Feature/feed
|
2020-06-16 17:44:56 +03:00 |
|
Ilya Oleshko
|
b6dd65f1c7
|
Merge branch 'master' into feature/files
|
2020-06-15 09:22:52 +03:00 |
|
|
|
a05d0a94c8
|
Files: fix
|
2020-06-13 18:31:45 +03:00 |
|
Ilya Oleshko
|
be6b6eb3ad
|
Merge branch 'master' into feature/files
|
2020-06-05 14:25:54 +03:00 |
|
|
|
635ff124fb
|
Json: fixed enum
|
2020-06-05 14:05:42 +03:00 |
|
|
|
1a5a7dfab5
|
Merge branch 'master' into feature/feed
|
2020-06-05 11:46:12 +03:00 |
|
|
|
06a7e81a49
|
Files: feed. FoldersModule
|
2020-06-04 19:36:43 +03:00 |
|
|
|
004dcc2d4d
|
Merge branch 'master' into feature/files
|
2020-06-04 16:48:03 +03:00 |
|
|
|
fed4d206f7
|
Revert logger
|
2020-06-04 16:46:58 +03:00 |
|
|
|
d7386049dc
|
Merge branch 'master' into feature/files
|
2020-06-04 16:27:06 +03:00 |
|
|
|
b55cc7c697
|
Startup: added command line
|
2020-06-04 16:26:31 +03:00 |
|
|
|
ae0fb62add
|
Merge branch 'master' into feature/files
|
2020-06-04 16:05:12 +03:00 |
|
|
|
794486f335
|
Notify: temp log
|
2020-06-04 16:04:17 +03:00 |
|
|
|
87af491e89
|
Feed: FilesModule
|
2020-06-04 13:54:13 +03:00 |
|
Ilya Oleshko
|
99e641bb2f
|
Merge branch 'master' into feature/files
|
2020-06-03 18:53:04 +03:00 |
|
|
|
d6274ea3e0
|
Added Feed.Aggregator
|
2020-06-03 17:53:58 +03:00 |
|
|
|
dbfb84786e
|
Files: simplified getHeaders method
|
2020-06-01 15:16:24 +03:00 |
|
|
|
a1778b5cdf
|
Packages updated
|
2020-06-01 14:36:23 +03:00 |
|
NikolayRechkin
|
4819c535b6
|
Merge branch 'master' into feature/files
|
2020-05-29 00:18:02 +03:00 |
|
|
|
3d9fd53369
|
Files: fix FFmpegService, fix download by chunks
|
2020-05-28 17:05:07 +03:00 |
|
|
|
0a48d2b179
|
Merge branch 'master' into feature/files
|
2020-05-28 09:20:58 +03:00 |
|
|
|
80dcee7ed4
|
Files: fix long operations
|
2020-05-27 18:23:50 +03:00 |
|
|
|
e7ecaefa3c
|
Added JsonStringEnumConverter
|
2020-05-27 16:19:58 +03:00 |
|
NikolayRechkin
|
e8a0bbcd73
|
Merge branch 'feature/files' into feature/media-viewer
|
2020-05-21 10:10:08 +03:00 |
|
|
|
a61103e0f8
|
Merge branch 'master' into feature/files
|
2020-05-20 12:59:32 +03:00 |
|
|
|
a064da49f4
|
Files: fix OpenEdit
|
2020-05-20 12:58:40 +03:00 |
|
|
|
68dfa9dcd7
|
Merge branch 'master' into feature/files
|
2020-05-20 11:27:52 +03:00 |
|
|
|
cee180669b
|
Files: added FileEntryWrapperConverter
|
2020-05-20 11:27:20 +03:00 |
|
|
|
0705756719
|
Merge branch 'master' into feature/files
|
2020-05-19 23:13:51 +03:00 |
|
NikolayRechkin
|
ea02ee9313
|
Merge branch 'feature/files' into feature/media-viewer
|
2020-05-19 00:30:31 +03:00 |
|
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
|
|
609290dcd9
|
Merge branch 'master' into feature/files
|
2020-05-18 12:03:38 +03:00 |
|
|
|
7e387cf51a
|
Files: fix
|
2020-05-18 11:59:37 +03:00 |
|
|
|
1842076658
|
Merge branch 'master' into feature/files
|
2020-05-18 10:51:37 +03:00 |
|
|
|
f0adf6d38e
|
FileOperation: ProgressStep fixed
|
2020-05-18 10:43:53 +03:00 |
|
|
|
550b0dd20e
|
Sln: packages updated
|
2020-05-18 10:27:22 +03:00 |
|
|
|
2424924eed
|
Files: optimization
|
2020-05-17 21:11:56 +03:00 |
|
NikolayRechkin
|
52f687bd65
|
Merge branch 'feature/files' into feature/media-viewer
|
2020-05-17 19:16:38 +03:00 |
|
|
|
47c79d57f0
|
Optimization
|
2020-05-17 16:08:20 +03:00 |
|
|
|
b5e31b63c9
|
Files: fix RemoveSecurityInfo
|
2020-05-15 18:12:04 +03:00 |
|
|
|
aeef09bbc1
|
Merge branch 'master' into feature/files
|
2020-05-15 12:58:43 +03:00 |
|
|
|
19a43e461a
|
Files: createindex fixed
|
2020-05-15 12:57:40 +03:00 |
|
|
|
2c21d99ca2
|
Files: fix
|
2020-05-14 19:53:26 +03:00 |
|
|
|
93f6771f48
|
Files: serializer
|
2020-05-14 18:52:06 +03:00 |
|
|
|
de55454c84
|
Merge branch 'master' into feature/files
|
2020-05-14 17:08:59 +03:00 |
|
|
|
28c09d37f2
|
Files: fixed DbFilesSecurity keys
|
2020-05-14 15:43:56 +03:00 |
|
|
|
17a88df5ac
|
Files: fix download
|
2020-05-14 13:47:53 +03:00 |
|
|
|
1d245236ef
|
Merge branch 'master' into feature/files-index
|
2020-05-14 12:19:34 +03:00 |
|
NikolayRechkin
|
1746b3c361
|
Files: fixed video conversion
|
2020-05-09 21:06:53 +03:00 |
|
|
|
6bf191b161
|
AddFilesWrapperService -> AddFactoryIndexerFileService, AddFolderWrapperService -> AddFactoryIndexerFolderService,
|
2020-05-08 18:15:08 +03:00 |
|
|
|
74e851e01b
|
ElasticSearch: fixed MatchAll
|
2020-05-08 18:10:53 +03:00 |
|
|
|
f547df107e
|
Merge branch 'master' into feature/files
|
2020-05-07 14:40:51 +03:00 |
|
|
|
7bf739fe09
|
Optimization
|
2020-05-07 14:02:29 +03:00 |
|
|
|
aff67cbc03
|
Merge branch 'master' into feature/files
|
2020-05-07 09:16:25 +03:00 |
|
|
|
eab3a9b2bd
|
Files: fixed download
|
2020-05-06 19:55:10 +03:00 |
|
|
|
05d194ba6e
|
Merge branch 'master' into feature/files
|
2020-05-06 18:22:02 +03:00 |
|
|
|
c077f0d1d4
|
Files: added SecurityInfoModel
|
2020-05-06 18:10:27 +03:00 |
|
|
|
7cc06c2322
|
ElasticSearch: state
|
2020-05-06 14:32:26 +03:00 |
|
|
|
02b33bc07b
|
Merge branch 'master' into feature/files-index
# Conflicts:
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-05-06 11:54:26 +03:00 |
|
|
|
1526d8e502
|
Common: removed StreamCopyTo
|
2020-05-06 11:41:27 +03:00 |
|
Ilya Oleshko
|
5aae59fb21
|
Merge branch 'master' into feature/files
|
2020-05-06 10:28:36 +03:00 |
|
|
|
79e2387da4
|
Files: fixed trash folder
|
2020-05-06 10:20:10 +03:00 |
|
|
|
bee4693566
|
Merge branch 'master' into feature/files
|
2020-04-30 16:37:57 +03:00 |
|
|
|
1a269749fc
|
Files: fix removing
|
2020-04-30 16:34:15 +03:00 |
|
|
|
324ea4f8cf
|
Merge branch 'master' into feature/files
|
2020-04-30 14:19:13 +03:00 |
|
|
|
bac295c589
|
Files: fix remove operation
|
2020-04-30 14:09:27 +03:00 |
|
|
|
9a7d7ac7c6
|
Files: fixed transaction
|
2020-04-30 11:56:55 +03:00 |
|
|
|
7ffd2c702f
|
Files: search
|
2020-04-29 19:01:38 +03:00 |
|
|
|
37b126e5cd
|
Files: search
|
2020-04-29 17:11:31 +03:00 |
|
|
|
bcfbac05c6
|
ElastiSearch: removed Wrapper, WrapperWithDoc
|
2020-04-29 11:04:19 +03:00 |
|
|
|
b9a432cb89
|
Files: removed FilesWrapper, FolderWrapper
|
2020-04-28 20:32:51 +03:00 |
|
|
|
adab38548a
|
Files: Index Service
|
2020-04-28 18:11:10 +03:00 |
|
|
|
b5671cc460
|
Files: Service
|
2020-04-27 19:59:52 +03:00 |
|
|
|
57f4c3788e
|
ElasticSearch: refactoring. Wrapper replaced with ISearchItem
|
2020-04-27 14:27:58 +03:00 |
|
Ilya Oleshko
|
4abc9b67e4
|
Merge branch 'master' into feature/files
|
2020-04-24 10:18:07 +03:00 |
|
|
|
4f025d9931
|
Files: fixed download
|
2020-04-23 14:50:34 +03:00 |
|
|
|
bc4a479fc6
|
Files: DocuSignHandler
|
2020-04-20 15:32:24 +03:00 |
|
|
|
c40acf19fb
|
Files: ThirdPartyAppHandler
|
2020-04-20 15:08:24 +03:00 |
|
|
|
b55ef3aa37
|
Merge branch 'master' into feature/files
|
2020-04-20 11:19:17 +03:00 |
|
|
|
eef99a3e96
|
Files: ChunkedUploaderHandler
|
2020-04-20 11:08:04 +03:00 |
|
Ilya Oleshko
|
8c349b0ee2
|
Merge branch 'master' into feature/files
|
2020-04-16 16:10:55 +03:00 |
|
|
|
1b0784e3cf
|
Files: updated JWT
|
2020-04-16 16:07:30 +03:00 |
|
|
|
f18ef7d26a
|
Merge branch 'master' into feature/files
|
2020-04-16 13:41:47 +03:00 |
|
|
|
0d6acd74fb
|
Files: fix thirdparty
|
2020-04-16 13:33:58 +03:00 |
|
|
|
e1ed073ab6
|
Merge branch 'master' into feature/files
|
2020-04-16 12:00:01 +03:00 |
|
|
|
d873e73304
|
Files: fix upload
|
2020-04-16 11:50:52 +03:00 |
|
|
|
22652fbd13
|
Files: thirdparty fix
|
2020-04-16 10:14:24 +03:00 |
|
|
|
c788c6f223
|
Merge branch 'master' into feature/files
|
2020-04-16 09:45:03 +03:00 |
|
|
|
1dbdb1aedd
|
Files: configuration
|
2020-04-15 18:39:59 +03:00 |
|
Ilya Oleshko
|
8a3254a70c
|
Merge branch 'master' into feature/files
|
2020-04-14 14:32:36 +03:00 |
|
|
|
ae0b217172
|
Files: FileHandler
|
2020-04-13 14:46:26 +03:00 |
|
Ilya Oleshko
|
0b4c504c99
|
Server: Files: Fixed RecalculateFoldersCount after merge
|
2020-04-03 15:14:41 +03:00 |
|
Ilya Oleshko
|
3584919e82
|
Server: Files: Fixed DeleteFolder
|
2020-04-03 14:22:14 +03:00 |
|
Ilya Oleshko
|
f0916c4782
|
Merge branch 'master' into feature/files
|
2020-04-02 17:48:36 +03:00 |
|
Ilya Oleshko
|
f96db8dd51
|
Files: added property DisableFormat for string format
|
2020-04-02 15:05:53 +03:00 |
|
Ilya Oleshko
|
a9ff193903
|
Files: fixed property name
|
2020-04-02 14:21:05 +03:00 |
|
Ilya Oleshko
|
f4f6ec9054
|
Files: fixed missing after merge
|
2020-04-02 14:19:38 +03:00 |
|
|
|
bac73b4762
|
Merge branch 'master' into feature/files-refactoring
# Conflicts:
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-03-25 17:07:48 +03:00 |
|
|
|
674ae9b412
|
Files: Download operation
|
2020-03-25 17:04:02 +03:00 |
|
|
|
b62bdc6938
|
Files: MarkAsRead operation
|
2020-03-25 11:08:31 +03:00 |
|
|
|
211591dc6b
|
Merge branch 'master' into feature/files
|
2020-03-25 09:06:18 +03:00 |
|
|
|
7784c65bfb
|
Files: fixed removing folder
|
2020-03-24 17:03:48 +03:00 |
|
|
|
22e379b37b
|
Files: MoveOrCopy operation
|
2020-03-24 15:30:16 +03:00 |
|
|
|
4eab409bef
|
Files: delete operation
|
2020-03-20 17:35:51 +03:00 |
|
|
|
4dfdca6bea
|
Files: CrossDao
|
2020-03-20 16:05:34 +03:00 |
|
|
|
e986f73293
|
Files: fixed ComposeFileOperation
|
2020-03-20 11:11:38 +03:00 |
|
|
|
7862ed159d
|
Files: fix merge
|
2020-03-19 16:18:35 +03:00 |
|
|
|
978cf0e34e
|
Merge branch 'master' into feature/files-refactoring
# Conflicts:
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Server/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Server/Services/WCFService/FileOperations/FileOperation.cs
|
2020-03-19 16:07:16 +03:00 |
|
|
|
50c745dbd0
|
Files: ComposeFileOperation
|
2020-03-19 15:56:34 +03:00 |
|
Daniil Senkiv
|
d5f75d3f77
|
Merge branch 'master' into feature/files
|
2020-03-19 09:16:47 +03:00 |
|
|
|
25de308530
|
Files: added withSubFolders
|
2020-03-18 18:03:33 +03:00 |
|
Ilya Oleshko
|
a3fca8d358
|
Merge branch 'master' into feature/files
|
2020-03-18 17:46:29 +03:00 |
|
|
|
566eaa1a80
|
Files: fixed saveFolder
|
2020-03-18 17:41:35 +03:00 |
|
Ilya Oleshko
|
92fe787fef
|
Merge branch 'master' into feature/files
|
2020-03-18 17:10:57 +03:00 |
|
|
|
cb77ce4857
|
Files: fixed RecalculateFoldersCount
|
2020-03-18 16:51:36 +03:00 |
|
|
|
4a543560a7
|
Files: api
|
2020-03-18 16:19:37 +03:00 |
|
|
|
98eb263efd
|
Files: thirdparty. Fix
|
2020-03-17 17:47:39 +03:00 |
|
|
|
fad1f8255c
|
Files: thirdparty
|
2020-03-17 15:49:14 +03:00 |
|
|
|
ff36878397
|
Files: thirdparty refactoring
|
2020-03-17 10:48:33 +03:00 |
|
|
|
8f455e388f
|
Thirdparty: refactoring
|
2020-03-16 18:34:51 +03:00 |
|
|
|
212fb746c9
|
Files: thirdparty fix
|
2020-03-16 11:25:39 +03:00 |
|
Daniil Senkiv
|
4d50abfb63
|
Merge branch 'master' into feature/files
|
2020-03-13 17:51:46 +03:00 |
|
|
|
b3fbe38090
|
Files: fixed search
|
2020-03-13 17:36:18 +03:00 |
|
|
|
add68d36d4
|
Files: sharpbox
|
2020-03-13 16:40:58 +03:00 |
|
Daniil Senkiv
|
79f1f859b1
|
Files: fix returning items count
|
2020-03-13 15:38:09 +03:00 |
|
Daniil Senkiv
|
adc630d4c9
|
Files: fix returning items count
|
2020-03-13 15:29:39 +03:00 |
|
|
|
2241198a81
|
Files: Thirdparty. Onedrive, sharepoint
|
2020-03-13 10:37:42 +03:00 |
|
|
|
c7dab9943f
|
Files: GoogleDrive
|
2020-03-12 14:29:36 +03:00 |
|
|
|
10931faf92
|
Files: box
|
2020-03-11 18:39:48 +03:00 |
|
Ilya Oleshko
|
0eb43c4f0e
|
Files.Server: Added FileModel for creating file
|
2020-03-11 16:24:24 +03:00 |
|
Ilya Oleshko
|
5f628a7847
|
Files.Server: Added FileModel and FolderModel
|
2020-03-11 13:56:02 +03:00 |
|
Ilya Oleshko
|
0b8c870e19
|
web: common: bump version
|
2020-03-11 13:53:59 +03:00 |
|
|
|
314c2f9198
|
Files: added ProviderFileDao, ProviderFolderDao
|
2020-03-10 18:54:08 +03:00 |
|
|
|
03bb507d86
|
Files: added ProviderSecurityDao
|
2020-03-10 16:31:53 +03:00 |
|
|
|
f0111a72a0
|
Files: fixed get @share
|
2020-03-06 17:15:39 +03:00 |
|
|
|
6ccfbec3b0
|
Files: fixed remove folder
|
2020-03-06 16:48:04 +03:00 |
|
|
|
3f4ad15b46
|
Files: fropbox
|
2020-03-06 16:17:17 +03:00 |
|
|
|
ae9a5003f3
|
Files: refactoring
|
2020-03-05 10:24:50 +03:00 |
|
|
|
ece437cbc0
|
Files: refactoring
|
2020-03-04 17:40:05 +03:00 |
|
|
|
c3dd78047a
|
Files: refactoring
|
2020-03-04 13:30:29 +03:00 |
|
|
|
c780a881df
|
Files: fixed removing file method
|
2020-03-04 10:42:43 +03:00 |
|
|
|
38eefb5a20
|
Files: refactoring
|
2020-03-03 14:37:40 +03:00 |
|
|
|
aa9577e5c0
|
Files: template methods
|
2020-03-02 15:31:53 +03:00 |
|
|
|
8e06c42740
|
Files: added new interface
|
2020-02-28 14:32:11 +03:00 |
|
|
|
697b03ab6f
|
Files: fixed @share
|
2020-02-27 18:25:59 +03:00 |
|
|
|
4e0fef6c95
|
Files: Fixed product path
|
2020-02-27 13:46:16 +03:00 |
|
|
|
3ac06f934d
|
Files: fix
|
2020-02-27 11:51:05 +03:00 |
|
|
|
190341c716
|
Files: renamed filescontroller
|
2020-02-27 11:22:42 +03:00 |
|
|
|
dcff29c806
|
File: FileStorageService renamed
|
2020-02-26 14:52:55 +03:00 |
|
|
|
1b4198b36d
|
Files: ProductEntryPoint
|
2020-02-26 14:34:27 +03:00 |
|
|
|
c1c8bab59d
|
Files: api
|
2020-02-26 13:01:12 +03:00 |
|
|
|
a192178156
|
Merge branch 'feature/elastic' of github.com:ONLYOFFICE/AppServer into feature/elastic
|
2020-02-26 11:06:55 +03:00 |
|
|
|
35e2e20049
|
Files: added model
|
2020-02-25 15:21:48 +03:00 |
|
|
|
31dc839d22
|
web: Files: Fixed load Files home page
|
2020-02-25 14:47:50 +03:00 |
|
|
|
4ca24f0077
|
Files: Init Files.Client
|
2020-02-25 09:58:09 +03:00 |
|
|
|
7a8baecb2a
|
Files: ef, di
|
2020-02-19 11:37:52 +03:00 |
|
|
|
56d5d3f111
|
Files: Resources, EF
|
2020-02-18 11:39:28 +03:00 |
|
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +03:00 |
|
|
|
c082019270
|
Files: DI
|
2020-02-14 13:45:46 +03:00 |
|
|
|
785cc4c5a3
|
Files: DI
|
2020-02-13 18:12:27 +03:00 |
|
|
|
c0cc00bfbe
|
Files:DI
|
2020-02-13 15:19:25 +03:00 |
|
|
|
de4b4a0dde
|
Files: DI
|
2020-02-12 18:21:58 +03:00 |
|
|
|
efef2f696d
|
Files: DI
|
2020-02-12 16:50:38 +03:00 |
|
|
|
00246f7f9f
|
Files: Startup
|
2020-02-12 13:48:58 +03:00 |
|
|
|
0da5b85eb8
|
Files: DI, EF
|
2020-02-12 13:29:10 +03:00 |
|
|
|
816231d9e9
|
Files: DI
|
2020-02-11 18:15:39 +03:00 |
|
|
|
fdf5b27903
|
Files: DI
|
2020-02-11 18:10:30 +03:00 |
|
|
|
9fd33a1ef8
|
Files: DI
|
2020-02-11 15:10:06 +03:00 |
|
|
|
cc6b4db2f1
|
Files: DI
|
2020-02-11 14:51:45 +03:00 |
|
|
|
3e61074a44
|
Files: DI
|
2020-02-11 12:39:32 +03:00 |
|
|
|
2d73943b81
|
Files: DI
|
2020-02-10 19:04:54 +03:00 |
|
|
|
03af1cfac0
|
Files: DI
|
2020-02-10 16:46:01 +03:00 |
|
|
|
26b6ef0e2c
|
Files: DI
|
2020-02-10 16:06:03 +03:00 |
|
|
|
607478a658
|
Files: DI
|
2020-02-08 21:44:55 +03:00 |
|
|
|
e0fc7e6f39
|
Files: DI
|
2020-02-07 17:31:15 +03:00 |
|
|
|
96687f4fa6
|
Files: DI
|
2020-02-07 14:34:25 +03:00 |
|
|
|
3c23e2f4a7
|
Files: DI
|
2020-02-07 13:29:16 +03:00 |
|
|
|
b9a6d22821
|
Files: DI
|
2020-02-06 16:30:21 +03:00 |
|
|
|
6c8e2f030b
|
Files: DI
|
2020-02-06 16:06:36 +03:00 |
|
|
|
a5384d10ee
|
File: DI
|
2020-02-06 14:55:11 +03:00 |
|
|
|
35eca0d863
|
Files: DI
|
2020-02-06 11:56:12 +03:00 |
|
|
|
67049195f8
|
Files: DI, EF
|
2020-02-05 18:37:31 +03:00 |
|
|
|
508efb1fca
|
Files: EF, DI
|
2020-02-05 16:33:09 +03:00 |
|
|
|
646f061647
|
Files: DocumentServiceTracker
|
2020-02-05 11:30:04 +03:00 |
|
|
|
1026ad93b2
|
Files: EF, DI
|
2020-02-04 12:08:21 +03:00 |
|
|
|
767448acb9
|
Files: EF, DI
|
2020-02-04 11:41:04 +03:00 |
|
|
|
0229c1aeec
|
Files: Token
|
2020-02-03 18:31:53 +03:00 |
|
|
|
671b043b7e
|
Files: GoogleDriveApp
|
2020-02-03 16:31:42 +03:00 |
|
|
|
51d8b9758c
|
Files: BoxApp
|
2020-02-03 13:41:24 +03:00 |
|
|
|
0a8aa83813
|
Files: FileStorageServiceController
|
2020-01-31 18:32:27 +03:00 |
|
|
|
fa1cf519f9
|
Files: Global
|
2020-01-31 16:03:21 +03:00 |
|
|
|
a149b2409f
|
Files: removed not using classes
|
2020-01-31 14:21:18 +03:00 |
|
|
|
2dba07ea11
|
Files: Global
|
2020-01-31 10:56:40 +03:00 |
|
|
|
7d5a698be6
|
Files: TagDao
|
2020-01-30 16:59:42 +03:00 |
|
|
|
2a8d9ebd50
|
Dao: SecurityDao
|
2020-01-29 17:25:30 +03:00 |
|
|
|
48409f8f82
|
Files: folderDao
|
2020-01-29 15:42:17 +03:00 |
|
|
|
08d51bb1ed
|
Files: FileDao
|
2020-01-28 17:59:59 +03:00 |
|
|
|
4cee8feb84
|
Files: AbstractDao
|
2020-01-27 17:58:33 +03:00 |
|
|
|
b087949c10
|
Files: init commit
|
2020-01-27 14:15:18 +03:00 |
|
