Commit Graph

3192 Commits

Author SHA1 Message Date
76d7ed6c73 Merge branch 'master' into develop
# Conflicts:
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-23 21:42:44 +03:00
Vladislav Makhov
87ffdf40ad Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
# Conflicts:
#	web/ASC.Web.Components/package.json
2020-12-23 17:56:44 +03:00
Vladislav Makhov
9a567d3e53 web: components: added possibility to hide combo box with count items info 2020-12-23 17:55:03 +03:00
Vladislav Makhov
3d46b8e516 web: components: bump version 2020-12-23 17:53:00 +03:00
a21531dd15 web: components: bump version 2020-12-23 13:55:41 +03:00
c15072b982 Web: Components : DropDown : Fixed calculating open direction 2020-12-23 13:55:02 +03:00
a21c16ff1d web: components: bump version 2020-12-23 13:33:48 +03:00
7a22da766a Web: Components: added convertSideInfo to row-content 2020-12-23 13:31:17 +03:00
06de1efbae Update yarn.lock files 2020-12-22 11:59:57 +03:00
Alexey Kostenko
344cca51f8 web: components: bump version 2020-12-21 17:56:40 +03:00
Alexey Kostenko
f9257786c9 Web: Components: Added "disableHover" prop to button and paging components 2020-12-21 17:54:34 +03:00
9c51a031de web: components: bump version 2020-12-18 15:44:49 +03:00
60b172e8d8 Web: Components: fixed SelectedItem and SelectorAddButton click when components is disabled 2020-12-18 15:34:36 +03:00
f42fc72cf9 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-12-17 21:03:48 +03:00
3815a57394 Update yarn.lock files 2020-12-17 12:37:28 +03:00
af930be4a7 web: components: bump version 2020-12-17 12:30:45 +03:00
5f63797266 Web: Components: Disabled fake context-menu inside AvatarEditor 2020-12-17 12:30:23 +03:00
Artem Tarasov
61ea05ca2d web: components: bump version 2020-12-15 15:49:35 +03:00
Artem Tarasov
94240cc1c7 Web: Components: paging: fixed width dd 2020-12-11 16:33:02 +03:00
Artem Tarasov
277e934cb1 Web: Components: backdrop: added the ability to pass an array to className 2020-12-11 15:25:53 +03:00
Artem Tarasov
80d8ec58cd Web: Components: backdrop: simplified rendering conditions 2020-12-11 13:25:02 +03:00
Artem Tarasov
eaa436f28f Web: Components: backdrop: fixed class name 2020-12-11 10:20:42 +03:00
Artem Tarasov
b49c41929b web: components: bump version 2020-12-10 20:49:27 +03:00
Artem Tarasov
72a21a1def Merge branch 'develop' into bugfix/dropdown-fix 2020-12-10 20:46:24 +03:00
Artem Tarasov
e6dfb13d7d Web: Common/Components/Files: applied isAside prop for backdrop, fixed related bugs 2020-12-10 20:09:16 +03:00
Artem Tarasov
48f782b6bc Web: Common/Components: removed unnecessary DOM requests 2020-12-10 20:06:04 +03:00
Artem Tarasov
c8aad2f2d2 Web: Components: context-menu: added prop withBackdrop, tests 2020-12-10 19:42:59 +03:00
Artem Tarasov
5510487db8 Web: Components: dropdown: added backdrop, new props, tests 2020-12-10 19:41:42 +03:00
Artem Tarasov
83bfa3ed06 Web: Components: backdrop: backdrop rendering conditions changed 2020-12-10 19:40:23 +03:00
b0617ac111
Merge branch 'develop' into bugfix/upload-with-convertation 2020-12-10 19:35:51 +03:00
0b0d7187e0 Update yarn.lock files 2020-12-10 18:45:49 +03:00
TatianaLopaeva
8e455a134f web: components: bump version 2020-12-10 11:49:00 +03:00
Artem Tarasov
2c6616bafe Web: Components: paging: fixed width of dropdown with list of pages' 2020-12-09 16:13:05 +03:00
TatianaLopaeva
4cc62d8fe5 Merge branch 'develop' into bugfix/toast 2020-12-09 15:36:05 +03:00
TatianaLopaeva
eee2808ed4 Web: Components: Removed unnecessary comparison that prevented correct display of toasters when changing the screen width & refactoring 2020-12-09 15:34:10 +03:00
Artem Tarasov
6511557445 Web: Components/People: applied prop showDisabledItems 2020-12-09 13:09:41 +03:00
Artem Tarasov
4ebaa335ef Web: Components: combobox: added prop showDisabledItems to show disabled items when displayType !== toggle 2020-12-09 13:06:32 +03:00
Artem Tarasov
0bdd17ce6f Web: Components: drop-down: added prop to show disabled items 2020-12-09 12:38:58 +03:00
Artem Tarasov
fb10d00272 Web: Files/Components/Common/People: z-index fix 2020-12-09 10:59:04 +03:00
Artem Tarasov
854acc0b1a Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Components/package.json
2020-12-08 23:03:42 +03:00
e4a43ff558 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 18:26:11 +03:00
Alexey Kostenko
3c6639c9c9 web: components: bump version 2020-12-08 18:26:47 +03:00
Alexey Kostenko
3a94023ba7 Web: Components: Added custom filter icon 2020-12-08 18:24:04 +03:00
ce4a3e3338 Update yarn.lock files 2020-12-08 18:17:46 +03:00
c8f7555017 Merge branch 'develop' into bugfix/sharing-settings
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/yarn.lock
2020-12-08 18:06:31 +03:00
Alexey Kostenko
bc5b17367c Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 17:45:40 +03:00
Alexey Kostenko
74fb9dc052 web: components: bump version 2020-12-08 17:45:19 +03:00
7d3dde38c4 Update yarn.lock files 2020-12-08 15:26:54 +03:00
Artem Tarasov
de11873bd4 Web: Components: group-buttons-menu: fixed display of disabled items 2020-12-08 14:54:39 +03:00
Artem Tarasov
34d246deaf Web: Components/Files/People: z-index fix 2020-12-08 14:16:23 +03:00