|
|
c21898f2e0
|
add logger
|
2022-05-13 12:33:44 +03:00 |
|
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
|
|
88b59b1c30
|
refactoring
|
2022-04-22 16:24:54 +03:00 |
|
|
|
9eba173a44
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.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/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-04-21 22:36:29 +03:00 |
|
|
|
073ee2dc36
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-21 12:07:18 -04:00 |
|
|
|
05609787f2
|
Files: fix async
|
2022-04-21 18:55:49 +03:00 |
|
Timofey Boyko
|
e2f8f40086
|
Web:Files:SharingPanel: add truncate for sharing panel header
|
2022-04-21 18:15:34 +03:00 |
|
Timofey Boyko
|
796e3448bc
|
Web:Files:SharingPanel: add access rights translate
|
2022-04-21 18:10:19 +03:00 |
|
Timofey Boyko
|
bf8ac30f6f
|
Web:Files:add new key 'AccessRights' for EN and RU locales
|
2022-04-21 18:07:58 +03:00 |
|
|
|
1dff9e18c4
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-04-21 17:51:31 +03:00 |
|
|
|
d6feda992b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-21 17:33:16 +03:00 |
|
|
|
f8088cfbd2
|
Web: Files: fixed gallery translations, refactoring
|
2022-04-21 17:18:01 +03:00 |
|
|
|
a9a528ab84
|
Web: Files: createFormFromTemplate replaced with createFile
|
2022-04-21 16:57:44 +03:00 |
|
|
|
8b2114aea3
|
Web: Files: fixed FORM_GALLERY_URL
|
2022-04-21 16:42:27 +03:00 |
|
|
|
17cdd4b655
|
Web: Files: changed oforms loader
|
2022-04-21 16:37:32 +03:00 |
|
|
|
00b2c032e4
|
Web: Files: fixed MainButton options
|
2022-04-21 16:15:20 +03:00 |
|
|
|
03c8921293
|
Web: Files: fixed FromGallery loader
|
2022-04-21 16:01:49 +03:00 |
|
|
|
9a204b536a
|
Web: Files: fixed MainButton formActions
|
2022-04-21 15:41:17 +03:00 |
|
|
|
ebbd473ecf
|
Web: fixed getOforms language
|
2022-04-21 15:33:48 +03:00 |
|
|
|
fe0db050ff
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-21 14:49:18 +03:00 |
|
|
|
e7b4280df2
|
Web: Files: fixed getOforms
|
2022-04-21 14:38:14 +03:00 |
|
|
|
fff945cd18
|
Web: Files: fixed forms creation
|
2022-04-21 14:33:48 +03:00 |
|
|
|
50d627e58c
|
Web: Files: fixed getOforms
|
2022-04-21 13:57:04 +03:00 |
|
|
|
5a1062b61b
|
Web: Files: fix translations
|
2022-04-21 13:42:38 +03:00 |
|
Timofey Boyko
|
7dbb4f225d
|
Web:Files:Home: close sort button dropdown when item clicked for tile view and second click on item changed sort desc
|
2022-04-21 12:40:15 +03:00 |
|
|
|
e83f02c143
|
Web: Files: fixed gallery styles
|
2022-04-21 12:06:05 +03:00 |
|
|
|
eb96f5586e
|
Web: Files: fixed gallery translations for info panel
|
2022-04-21 11:57:48 +03:00 |
|
|
|
524a8e4cac
|
Merge branch 'feature/oforms-gallery' of github.com:ONLYOFFICE/AppServer into feature/oforms-gallery
|
2022-04-21 11:06:27 +03:00 |
|
|
|
b04f132cea
|
Web: Files: fixed gallery styles
|
2022-04-21 11:06:04 +03:00 |
|
|
|
2bf6dec41d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2022-04-21 10:53:58 +03:00 |
|
|
|
20ac091869
|
Merge branch 'feature/oforms-gallery' of github.com:ONLYOFFICE/AppServer into feature/oforms-gallery
|
2022-04-21 10:50:35 +03:00 |
|
|
|
48416ec5f8
|
Web: Files: Fix borders on thumbnails, refactoring
|
2022-04-21 10:50:21 +03:00 |
|
|
|
8ca6d0d0d5
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 17:27:53 +03:00 |
|
|
|
d7db5c3c7f
|
Web: Files: fixed onHideContextMenu
|
2022-04-20 16:43:15 +03:00 |
|
|
|
2cc9a2f2b5
|
Web: Files: added disabling hotkeys when opening the context menu
|
2022-04-20 16:05:24 +03:00 |
|
|
|
9541a9b8f5
|
refactoring
|
2022-04-20 15:21:42 +03:00 |
|
|
|
04fc13073f
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
|
2022-04-20 15:11:00 +03:00 |
|
|
|
ee931b3098
|
Web: Files: fix share icon
|
2022-04-20 14:55:23 +03:00 |
|
|
|
c6abeab006
|
Web: Files: fixed info-panel opening
|
2022-04-20 14:54:09 +03:00 |
|
|
|
eed752d1eb
|
Web: Files: fixed creating forms from the gallery
|
2022-04-20 14:47:21 +03:00 |
|
|
|
9b3cb874af
|
Web: Files: MediaViewer: fix t key
|
2022-04-20 14:43:14 +03:00 |
|
|
|
a4dcddc78d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 14:33:39 +03:00 |
|
|
|
25449b4af5
|
Web: Files: fixed creating forms from the gallery
|
2022-04-20 14:25:06 +03:00 |
|
|
|
c9abcba6e5
|
Web: Files: added creating forms from the gallery
|
2022-04-20 14:07:29 +03:00 |
|
|
|
11163c3129
|
Web: Files: added creating forms from the gallery
|
2022-04-20 14:02:22 +03:00 |
|
Timofey Boyko
|
ea885b61da
|
Web:Files:Panels: fix empty selection crash for sharing panel
|
2022-04-20 13:06:24 +03:00 |
|
|
|
b54a5716ad
|
Web: Files: fix load t
|
2022-04-20 12:41:35 +03:00 |
|
Timofey Boyko
|
fd0e6db6e1
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-20 10:47:34 +03:00 |
|
