|
|
44c65ee52c
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# public/locales/az/Common.json
# public/locales/bg/Common.json
# public/locales/cs/Common.json
# public/locales/de/Common.json
# public/locales/el/Common.json
# public/locales/en/Common.json
# public/locales/es/Common.json
# public/locales/fi/Common.json
# public/locales/fr/Common.json
# public/locales/it/Common.json
# public/locales/ja/Common.json
# public/locales/ko/Common.json
# public/locales/lo/Common.json
# public/locales/lv/Common.json
# public/locales/nl/Common.json
# public/locales/pl/Common.json
# public/locales/pt-BR/Common.json
# public/locales/pt/Common.json
# public/locales/ro/Common.json
# public/locales/ru/Common.json
# public/locales/sk/Common.json
# public/locales/sl/Common.json
# public/locales/tr/Common.json
# public/locales/uk/Common.json
# public/locales/vi/Common.json
# public/locales/zh-CN/Common.json
# web/ASC.Web.Client/src/store/index.js
|
2022-07-22 19:04:35 +03:00 |
|
|
|
1d10263162
|
Merge branch 'develop' into feature/remove-header
|
2022-07-22 18:59:13 +03:00 |
|
|
|
58626a8b4f
|
Web: Components: HelpButton: fix icon
|
2022-07-22 18:13:17 +03:00 |
|
|
|
6dcac0eb0d
|
Web: Components: Themes: fix color
|
2022-07-22 18:04:54 +03:00 |
|
|
|
4ce9acce3d
|
Merge branch 'develop' into feature/sso
# Conflicts:
# products/ASC.Files/Server/DocStore
|
2022-07-22 17:23:36 +03:00 |
|
|
|
bf1ce10736
|
Web: Common: Article: fix styles
|
2022-07-22 16:20:01 +03:00 |
|
|
|
5479b3452b
|
Web: Common: Article: fix style
|
2022-07-22 13:50:57 +03:00 |
|
|
|
b8e7eb9752
|
Web: Common: Article: fix area click
|
2022-07-22 13:43:27 +03:00 |
|
|
|
93d7221388
|
Web: Components: IconButton: add height
|
2022-07-22 13:43:11 +03:00 |
|
|
|
23d6cb773e
|
Web: Common: Article: fix styles
|
2022-07-22 13:29:22 +03:00 |
|
|
|
20d83a0059
|
Web: Common: Article: fix username
|
2022-07-22 12:53:02 +03:00 |
|
|
|
af85268ff1
|
Web: Common: Article: fix styles
|
2022-07-22 10:55:26 +03:00 |
|
|
|
180aa03d95
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-22 10:22:52 +03:00 |
|
TimofeyBoyko
|
9e3eb3c008
|
Web:Common:FilterInput: fix multy line of selected items
|
2022-07-22 05:37:17 +03:00 |
|
|
|
c15ca79dcb
|
Web: Common: Article: fix styles
|
2022-07-21 18:40:45 +03:00 |
|
Artem Tarasov
|
284f0ef58d
|
Web: Common/Client: deleted unnecessary comment, fix import tryRedirectTo
|
2022-07-21 18:05:23 +03:00 |
|
|
|
a288d72db2
|
Web: Common: Article: increase area click
|
2022-07-21 17:45:46 +03:00 |
|
|
|
afdd1b7908
|
Web: Components: ContextMenuButton: add iconClassName prop
|
2022-07-21 17:44:13 +03:00 |
|
|
|
459cc8d92e
|
Web: Common: Article: truncate long text
|
2022-07-21 17:10:30 +03:00 |
|
|
|
bdb3860b54
|
Web: Common: Article: add redirect to home page
|
2022-07-21 16:51:19 +03:00 |
|
|
|
07d8339b6a
|
Web: Common: Article: fix styles
|
2022-07-21 16:41:12 +03:00 |
|
Artem Tarasov
|
345dad709c
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 16:02:48 +03:00 |
|
|
|
ff04dcf1f4
|
Web: Common: Article: hide header on mobile
|
2022-07-21 14:45:28 +03:00 |
|
|
|
2fe786769f
|
Web: Common: SettingsStore: fix logo url
|
2022-07-21 14:43:22 +03:00 |
|
|
|
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 |
|
|
|
7045bd8540
|
Merge branch 'develop' into feature/sso
|
2022-07-21 13:07:36 +03:00 |
|
TimofeyBoyko
|
d742e5529c
|
Web:Components:ContextMenu: delete useless code
|
2022-07-21 13:00:43 +03:00 |
|
TimofeyBoyko
|
77f8eecf78
|
Web:Files: fix header of context menu for rooms
|
2022-07-21 12:01:38 +03:00 |
|
|
|
77d311b636
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 11:41:42 +03:00 |
|
TimofeyBoyko
|
1633d0782a
|
Web:Files:TableView: fix view at room folder when info panel is open
|
2022-07-21 11:24:24 +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
|
1f918c7ee8
|
Web:Components:MainButtonMobile: fix display for rooms
|
2022-07-20 17:03:14 +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
|
684e28d188
|
Web:Components:TableContainer: fix color of icon for group menu items
|
2022-07-20 08:40:11 +03:00 |
|
TimofeyBoyko
|
0782af817f
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-20 08:36:31 +03:00 |
|
Artem Tarasov
|
bd4eb87ae8
|
Web: Common: added export of fonts from the library
|
2022-07-19 23:11:29 +03:00 |
|
|
|
9e68c29d4f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
|
2022-07-19 21:22:18 +03:00 |
|
Artem Tarasov
|
4ddffad7b2
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-19 18:22:16 +03:00 |
|
|
|
66b0e8c303
|
Merge branch 'develop' into bugfix/tfa
|
2022-07-19 18:17:22 +03:00 |
|
TimofeyBoyko
|
709b40f338
|
Web:Components:MainButtonMobile: add withoutButton prop
|
2022-07-19 16:30:19 +03:00 |
|
|
|
c6179665a3
|
Web: Common: Article: open context menu by avatar click on tablet
|
2022-07-19 16:12:46 +03:00 |
|
|
|
93418bcac0
|
Web: Components: ContextMenu: fix
|
2022-07-19 16:11:54 +03:00 |
|
TimofeyBoyko
|
fd818d148e
|
Web:Common:Api: disable search withSubfolders and searchInContent for rooms
|
2022-07-19 15:57:14 +03:00 |
|
