|
d31d0c7d03
|
Web: Common: fixed PeopleSelector employee status PropType
|
2020-12-25 17:01:42 +03:00 |
|
|
25817f24ae
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-25 12:38:03 +03:00 |
|
|
9fbf5a5be5
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/components/PeopleSelector/PeopleSelector.js
|
2020-12-24 10:52:01 +03:00 |
|
Artem Tarasov
|
d756354ece
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
# web/ASC.Web.Common/package.json
|
2020-12-24 09:47:22 +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 |
|
|
2d9906f6a1
|
Web: Common: added employeeStatus to PeopleSelector, fixed display of disabled users
|
2020-12-22 15:34:19 +03:00 |
|
TatianaLopaeva
|
d1c415feca
|
Web: Common: MediaViewer: Fixed closing unsupported video in app.
|
2020-12-22 12:16:22 +03:00 |
|
|
20c7ee108e
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
# Conflicts:
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-12-22 11:59:26 +03:00 |
|
Artem Tarasov
|
e6938def26
|
Web: Files VersionHistory: refactoring
|
2020-12-22 11:46:22 +03:00 |
|
|
19d72f2fe8
|
Web: Setup i18next fallbackLng to "en"
|
2020-12-22 11:03:15 +03:00 |
|
Artem Tarasov
|
6fdbdb0d83
|
Web: Common: added isTabletView flag to store
|
2020-12-21 15:19:34 +03:00 |
|
Artem Tarasov
|
9dcde2d268
|
Web: Common: Layout: added new component Layout (from featature/fix-hide/show-header
|
2020-12-21 15:14:55 +03:00 |
|
Artem Tarasov
|
bfd11ede79
|
Merge branch 'develop' into feature/version-hostory-redesign
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
|
2020-12-21 13:15:43 +03:00 |
|
TatianaLopaeva
|
d07c28f184
|
Web: Common: Return a check condition for IOS. (iPad)
|
2020-12-21 11:13:56 +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
|
0ac797a726
|
Web: Common: Added a check condition for Chrome. (iPad)
|
2020-12-21 10:44:40 +03:00 |
|
TatianaLopaeva
|
f967897db0
|
Web: Common: PageLayout: Refactoring.
|
2020-12-18 21:24:37 +03:00 |
|
TatianaLopaeva
|
256e1eb0e0
|
Web: Common: PageLayout: Refactoring.
|
2020-12-18 20:19:32 +03:00 |
|
TatianaLopaeva
|
d5d71d0a7e
|
Web: Common: PageLayout: Fixed displaying at "Slide Over" on iPad.
|
2020-12-18 20:16:13 +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 |
|
|
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 |
|
|
76b04db830
|
Web: Common: Added VerstionBadge "Beta"
|
2020-12-17 18:21:48 +03:00 |
|
Alexey Kostenko
|
b62695dc59
|
Web: Common: MediaViewer: Title style fix
|
2020-12-17 14:54:05 +03:00 |
|
|
cbb0c75492
|
Web: Common: added employeeStatus to PeopleSelector
|
2020-12-16 11:37:50 +03:00 |
|
Artem Tarasov
|
a0f5261576
|
Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-12-14 20:59:14 +03:00 |
|
TatianaLopaeva
|
0657447229
|
Web: Common: PageLayout: Added maximum width when loading an article (tablet/mobile)
|
2020-12-11 18:44:35 +03:00 |
|
Artem Tarasov
|
8ae9dd0df7
|
Web: Common: FilterInput: fixed z-index for backdrop when HideFilter is displayed
|
2020-12-11 17:16:11 +03:00 |
|
Alexey Kostenko
|
3340786838
|
Web: Common: FilterInput: Fixed bug in the filter when navigating through groups in the People module
|
2020-12-11 16:00:00 +03:00 |
|
Artem Tarasov
|
1b825e4cfa
|
Web: Common: PageLayout: fixed condition for trigger stopping if current element is undefined
|
2020-12-11 11:54:07 +03:00 |
|
Artem Tarasov
|
82e3e35cd4
|
Web: Common: PageLayoyt: deleted console.log
|
2020-12-10 20:48:58 +03:00 |
|
Artem Tarasov
|
72a21a1def
|
Merge branch 'develop' into bugfix/dropdown-fix
|
2020-12-10 20:46:24 +03:00 |
|
Artem Tarasov
|
7fbe85b318
|
Web: Common: PageLayout: fixed application crash after calling the context menu with right button and then clicking on the backdrop
|
2020-12-10 20:23:49 +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 |
|
|
356ace1c57
|
Merge branch 'develop' into bugfix/upload-with-convertation
|
2020-12-10 19:14:58 +03:00 |
|
|
b85faae56b
|
Web: Common: fixed filter update
|
2020-12-10 18:41:42 +03:00 |
|
Alexey Kostenko
|
ea3f287acb
|
Web: Common: Removed unused prop
|
2020-12-10 14:25:51 +03:00 |
|
Alexey Kostenko
|
abda53a082
|
Web: Files/People/Common: Fixed header styles
|
2020-12-10 13:31:53 +03:00 |
|
Alexey Kostenko
|
1a53841499
|
Web: Files/People/Common: Fixed header style
|
2020-12-10 09:48:35 +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 |
|
|
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 |
|
Ilya Oleshko
|
d2719e1cd9
|
Web: Fixed usage lodash/isEqual on fast-deep-equal
|
2020-12-08 14:09:46 +03:00 |
|
Artem Tarasov
|
5446a6a24d
|
Merge branch 'develop' into feature/version-hostory-redesign
|
2020-12-08 14:03:01 +03:00 |
|
Artem Tarasov
|
071f6c27c3
|
Merge branch 'develop' into bugfix/dropdown-fix
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-12-08 13:15:02 +03:00 |
|
Alexey Kostenko
|
6a9b8ca662
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-08 12:23:36 +03:00 |
|
Viktor Fomin
|
982ce4e12c
|
Merge branch 'develop' into feature/floating-button
|
2020-12-07 14:50:49 +03:00 |
|
Alexey Kostenko
|
149adcc372
|
Merge branch 'develop' into bugfix/sharing-settings
|
2020-12-07 13:44:42 +03:00 |
|
Viktor Fomin
|
b693cbdd4f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button
|
2020-12-07 13:19:32 +03:00 |
|
Ilya Oleshko
|
83466bd638
|
Merge branch 'develop' into bugfix/login-fix
|
2020-12-07 09:52:04 +03:00 |
|