TatianaLopaeva
|
6a1e80f1fb
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/index.js
|
2020-12-24 11:03:52 +03:00 |
|
|
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 |
|
TatianaLopaeva
|
5c12649789
|
Web: Common: Fixed displaying when changing window height at desktop.
|
2020-12-23 16:28:37 +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 |
|
|
7803696e01
|
Update yarn.lock files
|
2020-12-23 12:43:27 +03:00 |
|
|
ce0e041b16
|
web: common: bump version
|
2020-12-23 12:30:08 +03:00 |
|
|
21d8c3db79
|
Web: Common: Changed Filter DEFAULT_EMPLOYEE_STATUS to Active
|
2020-12-23 12:29:42 +03:00 |
|
TatianaLopaeva
|
0bd9a4001a
|
Web: Common/People: Fixed automatic scrolling when loading, viewing a profile and updating a profile and refactoring.
|
2020-12-23 11:30:48 +03:00 |
|
TatianaLopaeva
|
91f09ed700
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-12-23 11:01:34 +03:00 |
|
|
73f92d0897
|
Web: Client: fixed user activation
|
2020-12-22 18:48:05 +03:00 |
|
|
3d23422ff5
|
web: common: bump version
|
2020-12-22 15:35:50 +03:00 |
|
|
2d9906f6a1
|
Web: Common: added employeeStatus to PeopleSelector, fixed display of disabled users
|
2020-12-22 15:34:19 +03:00 |
|
TatianaLopaeva
|
fe697b401d
|
web: common: bump version
|
2020-12-22 12:17:05 +03:00 |
|
TatianaLopaeva
|
d1c415feca
|
Web: Common: MediaViewer: Fixed closing unsupported video in app.
|
2020-12-22 12:16:22 +03:00 |
|
|
06de1efbae
|
Update yarn.lock files
|
2020-12-22 11:59:57 +03:00 |
|
|
48463f897c
|
web: common: bump version
|
2020-12-22 11:51:31 +03:00 |
|
|
19d72f2fe8
|
Web: Setup i18next fallbackLng to "en"
|
2020-12-22 11:03:15 +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 |
|
TatianaLopaeva
|
c88f63ba19
|
web: common: bump version
|
2020-12-21 11:14:07 +03:00 |
|
TatianaLopaeva
|
d07c28f184
|
Web: Common: Return a check condition for IOS. (iPad)
|
2020-12-21 11:13:56 +03:00 |
|
TatianaLopaeva
|
37046fc6a9
|
web: common: bump version
|
2020-12-21 10:46:45 +03:00 |
|
TatianaLopaeva
|
d7170bd448
|
Web: Common: PageLayout: Added a check condition if the device type is tablet. (iPad)
|
2020-12-21 10:46:35 +03:00 |
|
TatianaLopaeva
|
baf27c6cd2
|
web: common: bump version
|
2020-12-21 10:45:00 +03:00 |
|
TatianaLopaeva
|
0ac797a726
|
Web: Common: Added a check condition for Chrome. (iPad)
|
2020-12-21 10:44:40 +03:00 |
|
TatianaLopaeva
|
a6a8df6733
|
web: common: bump version
|
2020-12-18 21:24:47 +03:00 |
|
TatianaLopaeva
|
f967897db0
|
Web: Common: PageLayout: Refactoring.
|
2020-12-18 21:24:37 +03:00 |
|
TatianaLopaeva
|
3ab27c8280
|
web: common: bump version
|
2020-12-18 20:19:41 +03:00 |
|
TatianaLopaeva
|
256e1eb0e0
|
Web: Common: PageLayout: Refactoring.
|
2020-12-18 20:19:32 +03:00 |
|
TatianaLopaeva
|
3a017b57de
|
web: common: bump version
|
2020-12-18 20:16:25 +03:00 |
|
TatianaLopaeva
|
d5d71d0a7e
|
Web: Common: PageLayout: Fixed displaying at "Slide Over" on iPad.
|
2020-12-18 20:16:13 +03:00 |
|
Artem Tarasov
|
ec09f9ed2e
|
web: common: bump version
|
2020-12-18 18:32:36 +03:00 |
|
Artem Tarasov
|
ec190a5b98
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-18 18:23:15 +03:00 |
|
Artem Tarasov
|
3f7a2d3231
|
web: common: bump version
|
2020-12-18 18:23:04 +03:00 |
|
Artem Tarasov
|
6551e88c1e
|
Web: Common/Client: fix redirect after logout in Confirm
|
2020-12-18 18:22:53 +03:00 |
|
TatianaLopaeva
|
52627caab9
|
web: common: bump version
|
2020-12-18 18:14:21 +03:00 |
|
TatianaLopaeva
|
b967fe9925
|
Web: Common: PageLayout: Fixed displaying at "Slide Over" and "Split View" on iPad.
|
2020-12-18 18:13:25 +03:00 |
|
|
344139a262
|
Web: Client: About: Fixed padding between "copyright" and lines
|
2020-12-18 17:31:29 +03:00 |
|
|
b8c2165b93
|
Web: Client: About: added link target
|
2020-12-18 17:27:26 +03:00 |
|
Artem Tarasov
|
4c6ff22e64
|
Web: Client: Confirm: fix activateUser
|
2020-12-18 17:03:34 +03:00 |
|
Artem Tarasov
|
eeaf50d312
|
Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4
|
2020-12-18 16:22:55 +03:00 |
|
Artem Tarasov
|
a4aa7d7e9c
|
Web: Client: Confirm: fix createUser
|
2020-12-18 16:22:41 +03:00 |
|
|
52798af66e
|
Notification images
|
2020-12-18 16:12:48 +03:00 |
|
|
9c51a031de
|
web: components: bump version
|
2020-12-18 15:44:49 +03:00 |
|