TimofeyBoyko
|
c4de30ee0f
|
Web:Files:HOCs: fix warning after removing fileActionStore
|
2022-06-21 11:28:44 +03:00 |
|
TimofeyBoyko
|
c4483f2892
|
Merge branch 'develop' into feature/create-from-modal
|
2022-06-21 11:05:53 +03:00 |
|
|
72f0ac4f9b
|
file converter server: fixed bugs
|
2022-06-20 19:58:08 +03:00 |
|
TimofeyBoyko
|
9a58baa435
|
Web:Files: delete filesActionStore and useless code after adding global events for create and rename file/folder
|
2022-06-20 19:01:10 +03:00 |
|
|
c3faf982c5
|
Files: fix download
|
2022-06-20 18:29:07 +03:00 |
|
|
03e756277b
|
fixed warnings
|
2022-06-20 17:01:59 +03:00 |
|
TimofeyBoyko
|
fe4f4ac80d
|
Web:Files:GlobalEvents: delete console log
|
2022-06-20 15:06:04 +03:00 |
|
|
e6602a22ab
|
Files: fix copyas
|
2022-06-20 13:21:40 +03:00 |
|
|
50fe9e7b37
|
fixed sso path
|
2022-06-20 12:17:11 +03:00 |
|
TimofeyBoyko
|
413962bbaa
|
Web:Files:GlobalEvents: add title validation on rename
|
2022-06-20 12:14:49 +03:00 |
|
|
9f45f8994b
|
fix config
|
2022-06-20 11:31:32 +03:00 |
|
TimofeyBoyko
|
efa8a383d7
|
Web:Files:GlobalEvents: change dialog styles for device width less than 400px
|
2022-06-20 11:29:47 +03:00 |
|
TimofeyBoyko
|
991e3cc012
|
Web:Files:GlobalEvents: refactoring rename and create events
|
2022-06-20 11:05:58 +03:00 |
|
TimofeyBoyko
|
0bfa280c38
|
Web:Files:FilesActionsStore: fix rename event
|
2022-06-20 10:34:59 +03:00 |
|
TimofeyBoyko
|
c3620c6c91
|
Web:Files:Components: add rename and create global events
|
2022-06-20 10:09:03 +03:00 |
|
TimofeyBoyko
|
a71e637c98
|
Web:Files:FilesActionsStore: add type as argument to editCompleteAction and change setAction from fileActionStore to global event
|
2022-06-20 10:08:28 +03:00 |
|
TimofeyBoyko
|
71fea71531
|
Web:Files:FilesActionsStore: add type as argument to editCompleteAction and change setAction from fileActionStore to global event
|
2022-06-20 10:07:07 +03:00 |
|
TimofeyBoyko
|
3703693b34
|
Web:Files:DialogsStore: change create oform file from docx from action store to global event
|
2022-06-20 10:05:31 +03:00 |
|
TimofeyBoyko
|
fd3a45f301
|
Web:Files:ContextOptionStore: change rename file or folder from action store to global event
|
2022-06-20 10:04:33 +03:00 |
|
TimofeyBoyko
|
441786da21
|
Web:Files:Home: change create oform file from action store to global event
|
2022-06-20 10:02:48 +03:00 |
|
|
e2cee2c2fc
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.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/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.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/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/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.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/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-06-19 22:44:48 +03:00 |
|
|
1cca689e07
|
Merge pull request #695 from ONLYOFFICE/feature/12.0
Feature/12.0
|
2022-06-17 20:53:07 +03:00 |
|
|
72b0a81f51
|
fix
|
2022-06-17 20:51:01 +03:00 |
|
|
8ea04bcc81
|
Merge branch 'develop' into feature/12.0
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
|
2022-06-17 19:19:00 +03:00 |
|
|
ee5822ae00
|
removed radicale
|
2022-06-17 18:52:58 +03:00 |
|
|
945e9d8efe
|
moved from ddf515b8
|
2022-06-17 18:46:16 +03:00 |
|
TimofeyBoyko
|
ae66c8e4f6
|
Web:Files:Section:Header: change create file or folder from action store to global event
|
2022-06-17 16:16:14 +03:00 |
|
|
2479448c6c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-17 16:16:04 +03:00 |
|
TimofeyBoyko
|
10a745c1e6
|
Web:Files:withHotkeys: change create file or folder from action store to global event
|
2022-06-17 16:15:54 +03:00 |
|
|
9bbe797bfc
|
Web:Studio:Added Appearance component to COMMON_URLS.
|
2022-06-17 16:15:24 +03:00 |
|
|
c4d4e73c83
|
Web:Studio:Added an Appearance component to the Common Settings Submenu.
|
2022-06-17 16:14:26 +03:00 |
|
|
e6c51afc30
|
Web:Studio:Added Preview component.
|
2022-06-17 16:13:11 +03:00 |
|
|
cf0acb2179
|
Web:Studio:Added Appearance page.
|
2022-06-17 16:12:09 +03:00 |
|
|
47f2138571
|
Web:Added pin and plus icons for theme preview.
|
2022-06-17 16:10:55 +03:00 |
|
|
6d63763e94
|
Web:Components:Added user default theme colors.
|
2022-06-17 16:09:23 +03:00 |
|
TimofeyBoyko
|
a029abadf5
|
Web:Files:EmptyContainer: change create file or folder from action store to global event
|
2022-06-17 16:00:15 +03:00 |
|
TimofeyBoyko
|
0ab899d5c9
|
Web:Files: add GlobalEvents component
|
2022-06-17 15:51:55 +03:00 |
|
TimofeyBoyko
|
1a34e82155
|
Web:Files:Article: change create file or folder from action store to global event
|
2022-06-17 15:49:29 +03:00 |
|
|
080cde2888
|
Web: Files: Fix empty second line of FileRowContent on third-party folders
|
2022-06-17 15:39:45 +03:00 |
|
TimofeyBoyko
|
bac023f04c
|
Web:Files:Constants: add global events name
|
2022-06-17 14:54:17 +03:00 |
|
|
fa9316807c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-17 11:15:51 +03:00 |
|
|
06ce968e9f
|
Web: Files: fixed edit component styles
|
2022-06-17 11:15:32 +03:00 |
|
|
3c699266c2
|
Fixed Bug 57622 - Mobile. Hidden hotkeys for mobile devices
|
2022-06-17 11:04:05 +03:00 |
|
|
09de3c141c
|
Web: Files: Deleted useless code.
|
2022-06-17 10:31:38 +03:00 |
|
|
b62ba1d729
|
fix tests
|
2022-06-17 10:17:17 +03:00 |
|
mushka
|
930b05fc31
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 19:01:53 +03:00 |
|
mushka
|
776a37f538
|
changed InfoPanel behaviour on module switch + added InfoPanelLoader components + changed the way how InfoPanelHeader passed itself to Section + united GalleryHeader and InfoPanelHeader to one component
|
2022-06-16 19:01:30 +03:00 |
|
|
67b9a00068
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 17:23:09 +03:00 |
|
|
b26c2a8a6f
|
edit VersionHistory.json
|
2022-06-16 17:21:42 +03:00 |
|
|
e9a1220c0e
|
Web: Files: fixed oforms creation
|
2022-06-16 17:18:04 +03:00 |
|