Nikita
52e2925c8f
fix in @my
2022-05-26 13:24:12 +03:00
Nikita
4a0e61de7c
fixed a problem with DbContext in ASC.Files
2022-05-23 13:28:31 +03:00
9ed3b1cb2f
fix tests
2022-05-16 13:58:45 +03:00
f4727b411e
Test: fix
2022-05-13 18:08:30 +03:00
14f25c2da7
Test: fix
2022-05-13 14:48:51 +03:00
969c037d3c
Merge branch 'develop' into feature/fix-tests
2022-05-13 12:27:30 +03:00
84121f4451
fix
2022-04-29 17:26:21 +03:00
cf0e9c322d
ElasticSearch: fix
2022-04-29 16:17:52 +03:00
31c289a26b
fix-tests: change dir for log and products
2022-04-29 13:48:29 +03:00
4a773679e1
fix-tests: rework files tests
...
-rework tests (use httpClient)
-fix migration
-add description
-union similar tests
-add random port for asc.Files
-add time to db name
-change TestCaseSource to TestCase
2022-04-28 18:55:41 +03:00
e11fc2ff79
backend: updated packages version
2022-04-27 18:48:28 +03:00
36d914724d
backend: updated packages version
2022-04-27 17:54:31 +03:00
93f637467b
backend: updated packages version
2022-04-27 14:26:38 +03:00
19cf415898
backend: updated packages version
2022-04-27 13:02:17 +03:00
2a5aa715e4
fix tests
2022-04-25 11:09:51 +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
