|
|
831bdc578f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-21 14:22:28 +03:00 |
|
TimofeyBoyko
|
59fb67d3d2
|
Web:Files:Filter: fix clear filter
|
2022-07-20 19:10:27 +03:00 |
|
TimofeyBoyko
|
9ca843c26e
|
Web:Common:FilterInput: fix spread operator for changeFilterValue method
|
2022-07-20 18:51:24 +03:00 |
|
TimofeyBoyko
|
5f7fd97f46
|
Web:Common:Loaders: remove search block from filter block loader
|
2022-07-20 18:44:18 +03:00 |
|
TimofeyBoyko
|
66e4f2b12d
|
Web:Api: add withoutTags for rooms filter
|
2022-07-20 15:20:56 +03:00 |
|
TimofeyBoyko
|
f95d01dc7d
|
Web:Api:Rooms: add withoutMe to rooms filter
|
2022-07-20 15:11:14 +03:00 |
|
|
|
366c50bfc4
|
Web: Common: Article: add logo
|
2022-07-20 14:58:50 +03:00 |
|
TimofeyBoyko
|
7a9114f562
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-20 14:29:04 +03:00 |
|
|
|
68bfe739ca
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-20 14:15:42 +03:00 |
|
|
|
75042eedf0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
|
2022-07-20 10:00:32 +03:00 |
|
TimofeyBoyko
|
0782af817f
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-20 08:36:31 +03:00 |
|
|
|
66b0e8c303
|
Merge branch 'develop' into bugfix/tfa
|
2022-07-19 18:17:22 +03:00 |
|
|
|
c6179665a3
|
Web: Common: Article: open context menu by avatar click on tablet
|
2022-07-19 16:12:46 +03:00 |
|
TimofeyBoyko
|
fd818d148e
|
Web:Common:Api: disable search withSubfolders and searchInContent for rooms
|
2022-07-19 15:57:14 +03:00 |
|
|
|
839d6870f5
|
Web: Common: Article: fix align avatar
|
2022-07-19 14:46:31 +03:00 |
|
TimofeyBoyko
|
4084d3a250
|
Web:Common:FilterInput: add loader for filter block
|
2022-07-19 11:44:34 +03:00 |
|
TimofeyBoyko
|
e84c9e1f79
|
Web:Common:Loaders: add filter block loader
|
2022-07-19 11:37:51 +03:00 |
|
|
|
6e00220796
|
Web: Common: Article: use profile actions store
|
2022-07-18 21:47:05 +03:00 |
|
TimofeyBoyko
|
6e67c915db
|
Web:Common:FilterInput: add new filter items for work with options and checkbox
|
2022-07-18 20:26:15 +03:00 |
|
TimofeyBoyko
|
f15894a7e9
|
Web:Common:Api: fix searchInContent
|
2022-07-18 19:34:04 +03:00 |
|
TimofeyBoyko
|
c3179249ef
|
Web:Common:Api: fix rooms withSubfolder
|
2022-07-18 16:11:10 +03:00 |
|
|
|
e645fb8828
|
Web: Common: Article: fix profile style
|
2022-07-18 16:00:44 +03:00 |
|
|
|
7cc4e482ea
|
Web: Common: Article: add about action
|
2022-07-18 14:09:29 +03:00 |
|
TimofeyBoyko
|
4319c29da2
|
Web:Common:FilterInput: add display selected items under the filter row
|
2022-07-18 13:33:25 +03:00 |
|
TimofeyBoyko
|
8832aece23
|
Web:Files: move logic from virtual room page to home page
|
2022-07-16 09:50:32 +03:00 |
|
|
|
06092c8928
|
Web: Common: Article: hide profile on mobile
|
2022-07-15 14:01:33 +03:00 |
|
|
|
ec80b996e7
|
Web: Common: add confirmKey for validate tfa
|
2022-07-14 15:27:48 +03:00 |
|
|
|
379ed60458
|
Web: Common: fix set tfa api
|
2022-07-14 14:43:29 +03:00 |
|
TimofeyBoyko
|
564fe335f2
|
Web:Common:Api: add isRoom params to folder in getRooms method
|
2022-07-14 07:42:25 +03:00 |
|
|
|
42b4d8a59e
|
Web: Common: check password settings
|
2022-07-13 21:00:42 +03:00 |
|
|
|
04d2c2d51c
|
Web: move profile block to common article
|
2022-07-13 14:03:08 +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 |
|
|
|
72b00ffe94
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 14:24:11 +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 |
|
TimofeyBoyko
|
6602a71fe6
|
Web:Common:API: add isArchive to archived rooms
|
2022-07-12 10:22:19 +03:00 |
|
TimofeyBoyko
|
8bad489bf1
|
Web:Common:Navigation: add isRootRoom as second argument to onClick item
|
2022-07-11 16:08:40 +03:00 |
|
TimofeyBoyko
|
ca099daffb
|
Web:Common: fixed export and import decodeDisplayName
|
2022-07-08 18:30:50 +03:00 |
|
TimofeyBoyko
|
2e72e298e6
|
Web:Common: fixed export and import decodeDisplayName
|
2022-07-08 18:29:50 +03:00 |
|
TimofeyBoyko
|
43b9b6183c
|
Web:Common:Api: add decodeDisplayName to getRooms and getRoom api rooms methods
|
2022-07-08 18:22:11 +03:00 |
|
TimofeyBoyko
|
2155df63fe
|
Web:Common:Api: move decodeDisplayName function from files api to utils
|
2022-07-08 18:20:25 +03:00 |
|
mushka
|
58e68c1c12
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-08 17:23:02 +03:00 |
|
TimofeyBoyko
|
54435e755e
|
Web:Common:Api: fix equals rooms filter method
|
2022-07-08 14:50:42 +03:00 |
|
TimofeyBoyko
|
e5c46f62b6
|
Web:Common:Tags: add onSelectTag function
|
2022-07-08 14:40:49 +03:00 |
|
TimofeyBoyko
|
f9fa940fb2
|
Web:Common:Api: fix clone rooms filter
|
2022-07-08 14:40:30 +03:00 |
|
TimofeyBoyko
|
c8feb7899b
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-08 12:32:26 +03:00 |
|
TimofeyBoyko
|
7803751844
|
Web:Common:FilterInput: refactoring
|
2022-07-08 12:10:37 +03:00 |
|
TimofeyBoyko
|
334367bb33
|
Web:Common:Tags: delete 'No tag' tag if tags length = 0
|
2022-07-08 10:41:36 +03:00 |
|
TimofeyBoyko
|
1e8859b29e
|
Web:Common:Api: add method to get all tags
|
2022-07-08 10:41:00 +03:00 |
|
TimofeyBoyko
|
a3ca2d6052
|
Web:Common:Api: fix subject id for rooms filter
|
2022-07-08 10:40:26 +03:00 |
|
