Vashchuk Nikita
|
9348ad1a46
|
fix files tests
|
2022-07-13 12:52:13 +03:00 |
|
|
|
120a57c1bf
|
Merge branch 'develop' into feature/room_tests
|
2022-07-13 11:56:48 +03:00 |
|
|
|
62ce169017
|
Merge pull request #724 from ONLYOFFICE/feature/room-api-refactor
feature/room-api-refactor
|
2022-07-13 11:49:20 +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 |
|
|
|
72caeb475c
|
People: fixed change theme mathod
|
2022-07-12 20:45:12 +03:00 |
|
|
|
c9680ae830
|
fix tfaapp
|
2022-07-12 19:36:39 +03:00 |
|
|
|
a2129001c9
|
Files: added withoutTags, withoutMe parameters, refactor
|
2022-07-12 19:25:34 +03:00 |
|
|
|
bab140aaf3
|
Files: reworked rooms filter, added withoutTags, withoutMe parameters
|
2022-07-12 19:24:39 +03:00 |
|
TimofeyBoyko
|
77e62baad1
|
Web:Files:VirtualRooms: add fetching tags after fetching rooms
|
2022-07-12 19:07:58 +03:00 |
|
mushka
|
30ed90b8e9
|
Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign
|
2022-07-12 18:25:36 +03:00 |
|
mushka
|
9242d571b8
|
deleted InfoPanel/views folder
|
2022-07-12 18:25:21 +03:00 |
|
|
|
536282eaf3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 17:53:37 +03:00 |
|
mushka
|
e4d07810e8
|
fixed aside height on mobile browser
|
2022-07-12 17:40:00 +03:00 |
|
mushka
|
f99d8784f1
|
fixed RecoverAccess dialog
|
2022-07-12 17:28:13 +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
|
c59ffe797a
|
Web:People: fix filter after refactoring
|
2022-07-12 17:04:30 +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 |
|
|
|
72b00ffe94
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 14:24:11 +03:00 |
|
mushka
|
e752f0b0f6
|
Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign
|
2022-07-12 14:20:21 +03:00 |
|
mushka
|
45f2e63836
|
changed ConnectCloud dark theme and fixed ConsumerModalDialolg
|
2022-07-12 14:19:04 +03:00 |
|
|
|
404e014a59
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-12 14:18:29 +03:00 |
|
|
|
fa8898d522
|
Files: fixed converter
|
2022-07-12 14:18:26 +03:00 |
|
|
|
df65b26ce9
|
Merge pull request #723 from ONLYOFFICE/feature/security-settings
Feature/security settings
|
2022-07-12 14:16:53 +03:00 |
|
|
|
1385ef9111
|
Web: Files: Profile: disable text select
|
2022-07-12 14:09:15 +03:00 |
|
TimofeyBoyko
|
9bfb54bcc3
|
Web:Files:VirtualRooms: add group menu for virtual room pages
|
2022-07-12 14:05:51 +03:00 |
|
|
|
dadde49866
|
Web: Files: Profile: add logout action
|
2022-07-12 14:01:31 +03:00 |
|
|
|
019cb6b8d2
|
Web: Files: Profile: add hotkeys action
|
2022-07-12 13:59:37 +03:00 |
|
|
|
a9d5080f5d
|
Web: Client: Settings: disabled autofocus
|
2022-07-12 13:50:55 +03:00 |
|
|
|
7b19b2f730
|
Web: Client: Settings: SessionLifetime: fix show reminder
|
2022-07-12 13:41:50 +03:00 |
|
mushka
|
6f5b84308d
|
fixed translation on Register dialog
|
2022-07-12 13:08:29 +03:00 |
|
|
|
14450fbdd1
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 12:59:50 +03:00 |
|
|
|
91b652aa8e
|
Merge branch 'feature/modal-redesign' of https://github.com/ONLYOFFICE/AppServer into feature/modal-redesign
|
2022-07-12 12:59:36 +03:00 |
|
|
|
0d0eed6d1a
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-12 12:57:57 +03:00 |
|
|
|
71ca12b8e2
|
Update .gitignore with radicale plugin files
|
2022-07-12 12:53:30 +03:00 |
|
mushka
|
a222f836c4
|
fixed ConsumerModalDialog compennt
|
2022-07-12 12:50:08 +03:00 |
|
mushka
|
96e85f9cb3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 12:34:43 +03:00 |
|
|
|
e9a15cc2a4
|
added [HttpGet("iprestrictions/settings")]
|
2022-07-12 12:20:59 +03:00 |
|
|
|
c9f7e95d5c
|
fixed iprestrictions method
|
2022-07-12 12:06:38 +03:00 |
|
|
|
fd986320f2
|
Api: fixed maildomainsettings
|
2022-07-12 11:47:05 +03:00 |
|
|
|
e4f9138e25
|
Web: Files: Profile: add profile and settings actions
|
2022-07-12 11:35:06 +03:00 |
|
|
|
a650a8e0ca
|
Web: Files: Article: add adaptive
|
2022-07-12 11:19:31 +03:00 |
|
|
|
59121d0ced
|
Web: Components: add base avatar size
|
2022-07-12 11:02:00 +03:00 |
|
TimofeyBoyko
|
1bee56d3aa
|
Web:Files:VirtualRooms: disable open archived rooms and fix logo
|
2022-07-12 10:22:46 +03:00 |
|
TimofeyBoyko
|
6602a71fe6
|
Web:Common:API: add isArchive to archived rooms
|
2022-07-12 10:22:19 +03:00 |
|
|
|
61d824db3c
|
Web: Client: Main: fix height
|
2022-07-11 23:11:27 +03:00 |
|
|
|
60cd3c2b09
|
Web: Files: Article: add profile
|
2022-07-11 23:11:10 +03:00 |
|
|
|
98770ee156
|
Web: Client: Profile: add actions menu
|
2022-07-11 23:10:44 +03:00 |
|
