|
358ea18086
|
Files: divided files controller helper
|
2022-03-08 20:37:23 +03:00 |
|
|
78fafb08ab
|
Microsoft.NET.Sdk.Worker
|
2022-03-05 18:38:42 +03:00 |
|
|
e58d3324f2
|
Files: renamed api parameters
|
2022-03-05 17:41:47 +03:00 |
|
|
1a9ced4901
|
Web: Files: fixed context menu opening
|
2022-03-05 17:36:04 +03:00 |
|
|
bededa43f7
|
Merge branch 'feature/people-refactor' of github.com:ONLYOFFICE/AppServer into feature/people-refactor
|
2022-03-05 16:28:52 +03:00 |
|
|
9add54cf6b
|
People: renamed api params
|
2022-03-05 16:20:51 +03:00 |
|
|
51475c0c51
|
People: removed engines
|
2022-03-05 15:57:46 +03:00 |
|
|
d035deba31
|
Merge branch 'feature/backend-refactor' into feature/files-refactor
# Conflicts:
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Server/GlobalUsings.cs
|
2022-03-05 11:50:42 +03:00 |
|
|
475269ee84
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
# products/ASC.Files/Core/Model/FileEntryWrapper.cs
# products/ASC.Files/Core/Model/FileShareWrapper.cs
# products/ASC.Files/Core/Model/FileWrapper.cs
# products/ASC.Files/Core/Model/FolderWrapper.cs
# products/ASC.People/Server/GlobalUsings.cs
|
2022-03-05 11:27:58 +03:00 |
|
|
99378a027e
|
Csproj: ImplicitUsings
|
2022-03-05 11:20:05 +03:00 |
|
|
fb83a54871
|
Merge branch 'feature/backend-refactor' into feature/refactoring-VoipService
|
2022-03-05 10:44:39 +03:00 |
|
|
77144d6f3c
|
added mapping
|
2022-03-05 10:28:50 +03:00 |
|
|
4a61f9fce5
|
VoipService: refactor mapping
|
2022-03-04 19:35:12 +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 |
|
|
a4891f136a
|
Merge pull request #570 from ONLYOFFICE/feature/asc-files-core-refactor
Feature/asc files core refactor
|
2022-03-03 23:12:19 +03:00 |
|
|
3d2d6b12e6
|
Files: removed unnecessary usings
|
2022-03-03 21:19:52 +03:00 |
|
|
f82d9ffaf8
|
Files: used WebApplicationBuilder, implicit usings
|
2022-03-03 21:15:48 +03:00 |
|
|
99f0f702f8
|
Files: refactor
|
2022-03-03 21:01:34 +03:00 |
|
|
ee027f8508
|
Files: rremoved unnecessary
|
2022-03-03 20:55:16 +03:00 |
|
|
c827c628c5
|
Files: separated controllers
|
2022-03-03 20:33:11 +03:00 |
|
|
418ca246c8
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
# products/ASC.People/Server/Startup.cs
|
2022-03-03 14:35:22 +03:00 |
|
|
4e08a6f2cf
|
Files: fix
|
2022-03-03 14:25:09 +03:00 |
|
|
1b352c76f6
|
Added using AddControllers method
|
2022-03-03 14:04:17 +03:00 |
|
|
74345b1c3c
|
Web: Files: ContextOptionsStore fixed onClickLinkEdit, fixed imports
|
2022-03-03 12:37:54 +03:00 |
|
|
ba2fc9fe88
|
Merge branch 'develop' into refactoring/refactoring-context-menu
|
2022-03-03 12:33:42 +03:00 |
|
|
54cecbd5b3
|
Web: Files: fixed ContextOptionsStore errors
|
2022-03-03 12:29:48 +03:00 |
|
|
0600452b87
|
People: renamed
|
2022-03-02 21:24:45 +03:00 |
|
|
2cc05247db
|
Web: Files: removed withContextOptions HOC, added ContextOptionsStore, moved getting context model to open function
|
2022-03-02 15:15:03 +03:00 |
|
|
f57cff1dcc
|
Merge branch 'develop' into feature/backup
|
2022-03-02 11:21:57 +03:00 |
|
|
a73606f1f9
|
Files: used implicit usings
|
2022-03-01 17:26:30 +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 |
|
|
609427bf20
|
merge from feature/backend-refactor
|
2022-03-01 15:57:49 +03:00 |
|
|
b48bd37ea6
|
Merge branch 'feature/backend-refactor' into feature/people-refactor
|
2022-03-01 15:27:07 +03:00 |
|
|
2719149f3d
|
People: used imlicit usings
|
2022-03-01 14:58:37 +03:00 |
|
|
b21891ef78
|
People: logic transferred to engines
|
2022-03-01 14:52:52 +03:00 |
|
|
fe77e0a331
|
fix build
|
2022-03-01 13:36:34 +03:00 |
|
|
0a51cf1cd5
|
remove unnecessary
|
2022-02-28 23:30:49 +03:00 |
|
|
8474cb8d37
|
refactor
|
2022-02-28 23:25:25 +03:00 |
|
|
c887362ea3
|
People: separated people controller
|
2022-02-28 22:23:39 +03:00 |
|
|
1665fe7bf6
|
People: refactor
|
2022-02-28 21:54:08 +03:00 |
|
|
c252b94060
|
People: reorganize
|
2022-02-28 21:38:25 +03:00 |
|
|
542ce9c414
|
People: rename
|
2022-02-28 21:36:40 +03:00 |
|
|
6be380656f
|
People: model to dto
|
2022-02-28 21:12:18 +03:00 |
|
|
f8d3d46e28
|
People: rename
|
2022-02-28 20:58:24 +03:00 |
|
|
1097d5e246
|
People: Controllers to ApiControllers, Models to ApiModels
|
2022-02-28 20:56:05 +03:00 |
|
|
e5ba722f7c
|
Web: Files: fixed withBadges, withContent HOCs re-render
|
2022-02-28 15:46:06 +03:00 |
|
|
d5c55fc384
|
FilesCore: reorganize dto
|
2022-02-28 14:26:29 +03:00 |
|
|
b56260bc38
|
FilesCore: Models to ApiModels
|
2022-02-28 14:15:31 +03:00 |
|
|
49a4c9e570
|
FilesCore: modet to dto
|
2022-02-28 14:06:30 +03:00 |
|
|
2092430bcf
|
Web: Files: fixed getting filesList
|
2022-02-28 11:03:42 +03:00 |
|
|
e6f111f651
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-25 20:16:00 +03:00 |
|
|
5a19f21902
|
Merge pull request #559 from ONLYOFFICE/feautre/asc-messaging-system-refactor
Feautre/asc messaging system refactor
|
2022-02-25 17:53:44 +03:00 |
|
|
cae358636e
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
|
2022-02-25 17:51:06 +03:00 |
|
|
04737a6c6d
|
Web: Client: Files: Added fixedDirection property for AccessComboBox
|
2022-02-25 17:45:20 +03:00 |
|
|
71bfac088f
|
added usings
|
2022-02-25 17:31:21 +03:00 |
|
|
66021c7885
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-25 17:30:59 +03:00 |
|
|
dc78ff3a33
|
Web: Client: People: Added fixedDirection property for DateField
|
2022-02-25 16:48:12 +03:00 |
|
|
6495da0d0b
|
Merge branch 'feature/backend-refactor' into feature/asc-messaging-system-refactor
|
2022-02-25 16:34:15 +03:00 |
|
|
ebf90d8aa9
|
Merge pull request #564 from ONLYOFFICE/feature/asc-files-service-refactor
Feature/asc files service refactor
|
2022-02-25 16:27:20 +03:00 |
|
|
65216705a5
|
FilesService: added missing configure logging
|
2022-02-25 16:20:05 +03:00 |
|
|
b1e5a6e28b
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-25 16:16:56 +03:00 |
|
|
f07aa0a183
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# config/nginx/onlyoffice.conf
# packages/asc-web-common/constants/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
|
2022-02-25 16:05:43 +03:00 |
|
|
7e50d1b097
|
Web: People: Profile: fixed help-icon styles
|
2022-02-25 13:41:47 +03:00 |
|
|
9c3274b5bd
|
FilesCore: refactor
|
2022-02-25 13:38:21 +03:00 |
|
|
85b03b508a
|
FilesCore: added IServiceScopeFactory, refactor
|
2022-02-25 13:04:37 +03:00 |
|
|
63d10f291f
|
Web: Files: RowView: Fixed editing input style for screens less than small tablet
|
2022-02-25 12:18:27 +03:00 |
|
|
6c0f8c18e1
|
Web: Files: EditingWrapperComponent: Fixed padding for table view
|
2022-02-25 12:16:12 +03:00 |
|
|
64473bb70e
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
|
2022-02-25 11:15:20 +03:00 |
|
|
e319a5e31f
|
Web: Files: EditingWrapperComponent: Fixed padding for cancel button
|
2022-02-25 11:07:08 +03:00 |
|
|
178671ea56
|
FilesService: add implicit
|
2022-02-24 23:55:29 +03:00 |
|
|
ad30ce26ce
|
FilesService: refactor
|
2022-02-24 23:28:07 +03:00 |
|
|
6d4f615350
|
FilesCore: used files-scoped namespaces
|
2022-02-24 22:34:26 +03:00 |
|
|
b6b8c4c7b5
|
FilesCore: privated properties replaced by private fields, added braces
|
2022-02-24 21:36:57 +03:00 |
|
|
8da91b7f8f
|
Web: Files: VersionHistory fixed Ipad styles
|
2022-02-24 19:29:01 +03:00 |
|
|
159dfe0028
|
Web: Files: fixed VersionHistory page styles
|
2022-02-24 19:13:40 +03:00 |
|
|
4be97f77e7
|
Merge branch 'bugfix/refactoring-table-view' of github.com:ONLYOFFICE/AppServer into bugfix/refactoring-table-view
|
2022-02-24 18:55:09 +03:00 |
|
|
9f5bae12ad
|
Web: Files: fixed EditingWrapperComponent styles
|
2022-02-24 18:54:55 +03:00 |
|
|
7377507481
|
Web: Files: RowView: Fixed right margin for last badge item
|
2022-02-24 18:03:27 +03:00 |
|
|
7bc4e141fa
|
Web: Files: RowView: Fixed displaying for quick buttons for small tablet width
|
2022-02-24 17:43:37 +03:00 |
|
|
7e67e9a41c
|
merge from develop
|
2022-02-24 17:33:02 +03:00 |
|
|
7995f38ef9
|
Web: Files: Badges/QuickButtons: Restored show logic after merge
|
2022-02-24 16:36:06 +03:00 |
|
|
ba0bfe7260
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
# Conflicts:
# packages/asc-web-components/calendar/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
|
2022-02-24 15:59:56 +03:00 |
|
|
2e000f1d9d
|
Web: People: fixed profile dates
|
2022-02-24 15:48:02 +03:00 |
|
|
d7566d0743
|
Merge branch 'develop' into feature/backend-refactor
|
2022-02-24 14:55:31 +03:00 |
|
|
0814ce13cc
|
Merge branch 'develop' into bugfix/refactoring-table-view
|
2022-02-24 14:53:43 +03:00 |
|
|
6fb3547652
|
Files: fix sql
|
2022-02-24 14:45:58 +03:00 |
|
|
51f79fa0e9
|
Files: fix track
|
2022-02-24 14:35:14 +03:00 |
|
|
9d0f1500e6
|
Files: fix routing
|
2022-02-24 13:24:39 +03:00 |
|
|
0f44d7fb4b
|
FilesService: refactor
|
2022-02-24 13:03:21 +03:00 |
|
|
04b0ac97d2
|
FilesService: used BackgroundService
|
2022-02-24 12:51:12 +03:00 |
|
|
f59fbe71ba
|
Merge branch 'develop' into bugfix/refactoring-table-view
|
2022-02-24 12:04:15 +03:00 |
|
|
b974d15ddd
|
FilesService: used file-scoped namespaces
|
2022-02-24 12:00:51 +03:00 |
|
|
b3317f35fc
|
FilesService: used WebApplicationBuilder
|
2022-02-24 11:58:41 +03:00 |
|
|
fab67e575c
|
Web: Files: fixed files loader styles
|
2022-02-24 11:44:40 +03:00 |
|
|
34f6570027
|
Web: Files: fixed files loader
|
2022-02-24 11:42:33 +03:00 |
|
|
89f72e80ad
|
FilesService: private properties replaced by private fields, added braces
|
2022-02-24 11:40:21 +03:00 |
|
|
902b2b54eb
|
Web: People: fixed table style
|
2022-02-24 11:33:58 +03:00 |
|
|
d7f16aa96d
|
Web: Table: fixed table styles
|
2022-02-24 11:20:32 +03:00 |
|
|
6925a83060
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Common/Caching/ICacheNotify.cs
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Caching/MemoryCacheNotify.cs
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
# common/ASC.Data.Storage/CrossModuleTransferUtility.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IDataStore.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/S3/S3UploadGuard.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/ASC.Data.Storage/WebPath.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/AuditReportCreator.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/ILinkDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IProviderInfo.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
# products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/FilesIntegration.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Security/IFileSecurity.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.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/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Core/Thirdparty/RegexDaoSelectorBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Helpers/PathProvider.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
# products/ASC.Files/Core/Model/FileEntryWrapper.cs
# products/ASC.Files/Core/Model/FileOperationWraper.cs
# products/ASC.Files/Core/Model/FileWrapper.cs
# products/ASC.Files/Core/Model/FolderContentWrapper.cs
# products/ASC.Files/Core/Model/FolderWrapper.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.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/Utils/ChunkedUploadSessionHolder.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileShareLink.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/Recaptcha.cs
# web/ASC.Web.Core/Sms/SmsManager.cs
# web/ASC.Web.Core/Sms/SmsProvider.cs
# web/ASC.Web.Core/Sms/SmsSender.cs
# web/ASC.Web.Core/SpaceUsageStatManager.cs
# web/ASC.Web.Core/Utility/UrlShortener.cs
|
2022-02-23 22:42:34 +03:00 |
|
|
8563fbc373
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/CommonApiResponse.cs
# common/ASC.Api.Core/Middleware/ResponseWrapper.cs
# common/ASC.Core.Common/Context/Impl/SubscriptionManager.cs
# products/ASC.Files/Core/Configuration/FilesSettings.cs
# products/ASC.Files/Core/Core/FileStorageService.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/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
|
2022-02-23 17:37:34 +03:00 |
|
|
d65d30ec24
|
Test: disable socketio
|
2022-02-23 17:10:04 +03:00 |
|
|
81b33e673a
|
Files: fix warnings
|
2022-02-23 17:09:32 +03:00 |
|
|
3d4e000778
|
Merge branch 'develop' into feature/async
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.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/FileConverter.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-02-23 16:01:55 +03:00 |
|
|
1379800971
|
Files: fix async
|
2022-02-23 13:42:14 +03:00 |
|
|
deeff80f26
|
Web: TabLe: refactoring table view
|
2022-02-22 16:00:26 +03:00 |
|
|
a797b3490e
|
Files: async fixes
|
2022-02-22 12:22:15 +03:00 |
|
|
2a7616585e
|
Web: Components: fixed table view
|
2022-02-22 12:10:27 +03:00 |
|
|
3aeac42444
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
|
2022-02-21 22:22:38 +03:00 |
|
|
9fe4971055
|
add mapping, project reorganization
|
2022-02-21 18:35:57 +03:00 |
|
|
7ad1462b81
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-21 12:51:45 +03:00 |
|
|
5b5ed4a4e3
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-18 18:55:59 +03:00 |
|
|
9c08a5c52e
|
Feed: moved feed migrations to ASC.Feed, resolved usings
|
2022-02-18 18:30:53 +03:00 |
|
|
91133d243e
|
Merge pull request #537 from ONLYOFFICE/feature/asc-feed-aggreagator-refactor
Feature/asc feed aggreagator refactor
|
2022-02-18 13:50:46 +03:00 |
|
|
955de9efa5
|
FilesService: add services
|
2022-02-18 12:48:19 +03:00 |
|
|
6ed624844b
|
Web: People: Re-write setIsEdit to arrow function
|
2022-02-18 11:17:58 +03:00 |
|
|
bd9d2e0bb1
|
FilesService: removed unnecessary
|
2022-02-17 18:03:09 +03:00 |
|
|
604019eead
|
FilesService: add services
|
2022-02-17 17:58:30 +03:00 |
|
|
eccb588362
|
Web: People: Profile: Added default width for language selector
|
2022-02-17 14:38:49 +03:00 |
|
|
e848d5d979
|
Web: Files: Table/Filter: Restored sorting inside favorite folder
|
2022-02-17 12:45:55 +03:00 |
|
|
7e011de3cf
|
Web: People: fixed display of registration date/birthday in user profile
|
2022-02-17 11:46:50 +03:00 |
|
|
7419eb87dc
|
Web: People: Added opportunity to unsubscribe from mailing list on My Profile page (/my?unsubscribe=tips)
|
2022-02-16 21:34:19 +03:00 |
|
Vashchuk Nikita
|
0a384b2c28
|
refactoring async methods
|
2022-02-16 15:57:37 +03:00 |
|
|
638390de68
|
Merge pull request #540 from ONLYOFFICE/feature/hide-filter-sort
Feature/hide filter sort
|
2022-02-16 15:14:10 +03:00 |
|
|
924d9bda34
|
Web: Files: Table: Added hiding sort actions inside TableHeader at recent and favorites folder
|
2022-02-16 13:58:57 +03:00 |
|
|
ee40f9ba7f
|
Web: Files: Filter: Added hiding sort items inside filter at recent and favorites folder
|
2022-02-16 13:55:42 +03:00 |
|
|
62b4b55dca
|
Web: Files: moved isEdit, titleWithoutExt to inject
|
2022-02-16 13:18:14 +03:00 |
|
|
5322ed2cec
|
Fixed Bug 55530 - Client.Files. Fixed the display of the file name when renaming.
|
2022-02-16 12:03:22 +03:00 |
|
|
73933162d5
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-15 19:16:20 +03:00 |
|
|
c1541d7901
|
Fixed Bug 55248 - Mobile.Client.Profile. Fixed closing the profile save window on the avatar editor page
|
2022-02-15 19:16:14 +03:00 |
|
|
5e12bf583c
|
Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’
|
2022-02-15 18:39:14 +03:00 |
|
|
76c422d3c0
|
FilesService: fixed starting service
|
2022-02-15 18:25:25 +03:00 |
|
|
4ac03079ca
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-aggreagator-refactor
|
2022-02-15 18:21:53 +03:00 |
|
|
7f4d29da03
|
Web: Editor: fixed canConvert
|
2022-02-15 16:57:32 +03:00 |
|
|
ead3820e66
|
Merge branch 'feature/refactoring-files-formats' of github.com:ONLYOFFICE/AppServer into feature/refactoring-files-formats
|
2022-02-15 16:33:00 +03:00 |
|
|
51a9e48a1b
|
Web: Files: fixed encryptionUploadDialog
|
2022-02-15 16:32:21 +03:00 |
|
|
1aa99f3802
|
Web: Files: removed TODO
|
2022-02-15 16:31:57 +03:00 |
|
Vashchuk Nikita
|
b17119b711
|
refactoring async methods
|
2022-02-15 16:20:06 +03:00 |
|
|
b04b6d897d
|
Merge branch 'hotfix/v1.1.1' into feature/refactoring-files-formats
|
2022-02-15 16:13:52 +03:00 |
|
|
ccc0838269
|
Web: Files: removed FormatsStore, added getting file formats from SettingsStore
|
2022-02-15 15:58:31 +03:00 |
|
|
fb5edcf627
|
Fixed Bug 51725 - Client.Clouds.Changed title of third party folder.
|
2022-02-15 15:57:11 +03:00 |
|
|
ca7140186d
|
Core: resolve properties for mapping, add mapping/projection
|
2022-02-15 13:30:05 +03:00 |
|
|
d64fe81e5e
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-15 13:29:36 +03:00 |
|
|
2ba6962e8c
|
Fix Bug 55527 - Client.Files. Badge ‘New’ on Save as/Create a copy/Upload.
|
2022-02-15 13:01:37 +03:00 |
|
Vashchuk Nikita
|
41d994ca32
|
fix
|
2022-02-15 12:42:47 +03:00 |
|
|
175e07b1d2
|
Web: Files: fix ads timeout
|
2022-02-15 11:34:40 +03:00 |
|
|
aae5f2c3b0
|
Web: Files: move new banner from hotfix/campaigns banner
|
2022-02-15 11:33:43 +03:00 |
|
|
12243c7cc8
|
fix 55063
|
2022-02-15 11:01:27 +03:00 |
|
|
0ef8f00fb3
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
|
2022-02-15 10:14:19 +03:00 |
|