TimofeyBoyko
|
bfc1422ba7
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-14 06:01:51 +03:00 |
|
|
|
ee9e381b26
|
fixed async
|
2022-07-13 20:09:43 +03:00 |
|
|
|
ea00433ff1
|
Files: tests. refactoring
|
2022-07-13 13:00:08 +03:00 |
|
|
|
120a57c1bf
|
Merge branch 'develop' into feature/room_tests
|
2022-07-13 11:56:48 +03:00 |
|
|
|
e7831d9b94
|
Files: moved parameter from body to query
|
2022-07-13 11:47:15 +03:00 |
|
|
|
06a98c508e
|
Merge branch 'develop' into feature/room_tests
# Conflicts:
# .gitignore
|
2022-07-12 22:48:47 +03:00 |
|
|
|
a8ba7ae685
|
removed logo test
|
2022-07-12 22:44:10 +03:00 |
|
TimofeyBoyko
|
77e62baad1
|
Web:Files:VirtualRooms: add fetching tags after fetching rooms
|
2022-07-12 19:07:58 +03:00 |
|
TimofeyBoyko
|
645be6d794
|
Web:Files:SelectedFolderStore: set roomType = null if roomType doesnt exists in selectedFolder
|
2022-07-12 17:19:52 +03:00 |
|
TimofeyBoyko
|
09122918f6
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-12 16:19:00 +03:00 |
|
|
|
c1be6ecb61
|
Settings: ignore id
|
2022-07-12 15:33:46 +03:00 |
|
|
|
fa8898d522
|
Files: fixed converter
|
2022-07-12 14:18:26 +03:00 |
|
TimofeyBoyko
|
9bfb54bcc3
|
Web:Files:VirtualRooms: add group menu for virtual room pages
|
2022-07-12 14:05:51 +03:00 |
|
TimofeyBoyko
|
1bee56d3aa
|
Web:Files:VirtualRooms: disable open archived rooms and fix logo
|
2022-07-12 10:22:46 +03:00 |
|
|
|
b2b55bfa5b
|
fixed subfolders method
|
2022-07-11 22:22:56 +03:00 |
|
TimofeyBoyko
|
58bd9509a1
|
Web:Files:Hocs: fix keyup on create docx after merge
|
2022-07-11 17:13:51 +03:00 |
|
TimofeyBoyko
|
a0651ecca4
|
Web:Files:HOCs: fix create operation with hotkeys
|
2022-07-11 16:36:46 +03:00 |
|
TimofeyBoyko
|
76dd9dd97d
|
Web:Files:VirtualRooms: add open room action to all view
|
2022-07-11 16:23:02 +03:00 |
|
TimofeyBoyko
|
8838d7282a
|
Web:Files:Store: add onOpenRoom action
|
2022-07-11 16:22:37 +03:00 |
|
TimofeyBoyko
|
cdd6bc40b5
|
Web:Files:Home: refactoring section header
|
2022-07-11 16:20:59 +03:00 |
|
TimofeyBoyko
|
67d1a49ffa
|
Web:Files:Home: upgrage onClickFolder at section header to work with rooms
|
2022-07-11 16:09:27 +03:00 |
|
TimofeyBoyko
|
a754d7fb71
|
Web:Files:Home: upgrage onBackToParentFolder at section header to work with rooms
|
2022-07-11 15:57:39 +03:00 |
|
TimofeyBoyko
|
95e03a49d2
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-11 14:55:50 +03:00 |
|
TimofeyBoyko
|
91ca312871
|
Merge branch 'develop' into feature/create-from-modal
|
2022-07-11 14:51:45 +03:00 |
|
TimofeyBoyko
|
5f41dc12ed
|
Web:Files:Store: delete useless selectedRoomsStore
|
2022-07-11 14:21:47 +03:00 |
|
TimofeyBoyko
|
50620640eb
|
Web:Files:SelectedFolderStore: add isPinned and roomType
|
2022-07-11 14:21:21 +03:00 |
|
TimofeyBoyko
|
4e63873bc4
|
Web:Files:FilesStore: add isRoom and isRootRoom for navigationPath at fetchFiles
|
2022-07-11 14:20:47 +03:00 |
|
TimofeyBoyko
|
42cc6dc5a5
|
Web:Files:Home: remove useless sorting from section body of tile view
|
2022-07-08 18:06:52 +03:00 |
|
|
|
63c2c34d44
|
refactoring tests
|
2022-07-08 15:31:07 +03:00 |
|
TimofeyBoyko
|
fffe60a1c7
|
Web:Files:VirtualRooms:TileView/TableView: add select tag to filter function
|
2022-07-08 15:00:30 +03:00 |
|
TimofeyBoyko
|
ee572da527
|
Web:Files:RoomsActionsStore: add onSelectTag action
|
2022-07-08 14:41:55 +03:00 |
|
TimofeyBoyko
|
a6a0bb9cc2
|
Web:Files:Store: init roomsActionsStore
|
2022-07-08 14:41:32 +03:00 |
|
TimofeyBoyko
|
4a2aa14722
|
Web:Files:Article: delete useless code after merge
|
2022-07-08 13:23:06 +03:00 |
|
TimofeyBoyko
|
c8feb7899b
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-08 12:32:26 +03:00 |
|
TimofeyBoyko
|
f85b116721
|
Web:Files:Home: refactoring section filter
|
2022-07-08 12:23:57 +03:00 |
|
TimofeyBoyko
|
723716dbc8
|
Web:Files:VirtualRooms: update filter
|
2022-07-08 12:10:17 +03:00 |
|
TimofeyBoyko
|
f46add9687
|
Web:Files:RoomsStore: add filterRooms, sortRooms, searchRoom
|
2022-07-08 12:09:57 +03:00 |
|
|
|
0504838691
|
fix tests
|
2022-07-08 11:46:34 +03:00 |
|
TimofeyBoyko
|
0ecb0ed9f7
|
Web:Files:VirtualRooms: delete tag from row info
|
2022-07-08 10:49:53 +03:00 |
|
|
|
b8a2cf5292
|
Files: update docstore submodule
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
|
2022-07-07 18:11:42 +03:00 |
|
|
|
c8458858e0
|
Merge branch 'develop' into feature/room_tests
|
2022-07-07 17:56:40 +03:00 |
|
|
|
f8c27acc7d
|
Merge branch 'develop' into feature/room_tests
|
2022-07-07 17:56:15 +03:00 |
|
|
|
912bb3ed36
|
Merge pull request #711 from ONLYOFFICE/feature/rooms-archive-delete-after
Feature/rooms-archive-delete-after
|
2022-07-07 17:55:40 +03:00 |
|
|
|
2bc07e0a1d
|
Files: added DeleteAfter for archiving/unarchiving rooms
|
2022-07-07 17:52:20 +03:00 |
|
|
|
b5d082d816
|
room tests:first version
|
2022-07-07 17:45:23 +03:00 |
|
|
|
7af929fee8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.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.People/Server/Controllers/PeopleController.cs
# products/ASC.People/Server/Models/MemberModel.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-07-07 17:41:41 +03:00 |
|
|
|
c3b505f08e
|
fix Bug 58035
|
2022-07-07 16:34:47 +03:00 |
|
|
|
f52162827e
|
Files: added DeleteAfter for rooms
|
2022-07-07 16:20:44 +03:00 |
|
|
|
f28a372418
|
Fix Bug 58040: active download button
|
2022-07-07 14:52:26 +03:00 |
|
|
|
75251220ba
|
Web: Files: ThirdPartyDialog: fix condition
|
2022-07-07 13:45:26 +03:00 |
|
