Vladislav Makhov
|
2391bc001c
|
web: common: bump version
|
2021-01-14 10:59:03 +03:00 |
|
Vladislav Makhov
|
567c951dfd
|
web: common: fix language data in private browsing mode
|
2021-01-14 10:58:49 +03:00 |
|
Vladislav Makhov
|
7289f53628
|
web: common: bump version
|
2021-01-13 11:27:59 +03:00 |
|
Vladislav Makhov
|
754ae6713d
|
web: common: fix link
|
2021-01-13 11:27:41 +03:00 |
|
Vladislav Makhov
|
7ad7d4556e
|
web: common: fix links in tpi settings
|
2021-01-12 09:27:04 +03:00 |
|
Vladislav Makhov
|
745bd8be2c
|
web: common: bump version
|
2021-01-12 09:25:42 +03:00 |
|
|
|
c7c9225923
|
Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2021-01-11 12:37:31 +03:00 |
|
|
|
60022bbc06
|
Update yarn.lock files
|
2020-12-30 21:33:07 +03:00 |
|
Vladislav Makhov
|
1f8769cd6b
|
Update yarn.lock
|
2020-12-30 19:51:17 +03:00 |
|
Vladislav Makhov
|
d87f9d0864
|
web: common: bump version
|
2020-12-30 19:45:24 +03:00 |
|
Vladislav Makhov
|
44ba6f350f
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-30 16:20:47 +03:00 |
|
Artem Tarasov
|
f419dadb6f
|
Web: Common: Layout: fix resize event listener for safari versions less then 14
|
2020-12-30 11:35:24 +03:00 |
|
|
|
7b4dc42620
|
Fix displaying header pre-loader on Desktop
|
2020-12-29 17:19:02 +03:00 |
|
Vladislav Makhov
|
e6cf51575a
|
Merge branch 'develop' into feature/desktop-view
|
2020-12-29 16:08:08 +03:00 |
|
|
|
39a0cb99de
|
Update yarn.lock files
|
2020-12-29 14:03:05 +03:00 |
|
|
|
e70e845c5f
|
web: common: bump version
|
2020-12-29 13:52:50 +03:00 |
|
|
|
f18d535cb1
|
Merge branch 'develop' into feature/upgrade-dependencies
|
2020-12-28 18:30:50 +03:00 |
|
Vladislav Makhov
|
d840506715
|
Fix desktop styles
|
2020-12-28 16:49:01 +03:00 |
|
Vladislav Makhov
|
737605b01e
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/en/translation.json
# products/ASC.Files/Client/src/components/panels/SharingPanel/locales/ru/translation.json
|
2020-12-28 11:34:26 +03:00 |
|
|
|
a21fff2ab1
|
Fix warning " > react-tooltip@3.11.6" has incorrect peer dependency "react@>=^16.0.0".
|
2020-12-28 11:04:34 +03:00 |
|
Vladislav Makhov
|
2ff0b2471d
|
Add isEditor param to regDesktop
|
2020-12-28 10:40:50 +03:00 |
|
Vladislav Makhov
|
17fd85b5c7
|
Update props validation
|
2020-12-28 10:39:30 +03:00 |
|
Vladislav Makhov
|
4c5131211c
|
Fix styles
|
2020-12-28 10:37:53 +03:00 |
|
|
|
472cb4bb0b
|
Fix warning Resolution field "js-yaml@3.13.1" is incompatible with requested version "js-yaml@~3.7.0"
|
2020-12-25 18:10:54 +03:00 |
|
|
|
2be04b3bc0
|
Update package.json and yarn.lock files
|
2020-12-25 17:48:11 +03:00 |
|
|
|
04e387f8d0
|
web: common: bump version
|
2020-12-25 17:03:03 +03:00 |
|
|
|
d31d0c7d03
|
Web: Common: fixed PeopleSelector employee status PropType
|
2020-12-25 17:01:42 +03:00 |
|
|
|
b88d418d41
|
Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-12-25 15:27:44 +03:00 |
|
Vladislav Makhov
|
497b725a59
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/App.js
# web/ASC.Web.Common/src/store/auth/reducer.js
|
2020-12-25 12:58:30 +03:00 |
|
|
|
25817f24ae
|
Merge branch 'develop' into bugfix/sharing-panel-refactoring
|
2020-12-25 12:38:03 +03:00 |
|
Vladislav Makhov
|
c9a5dd2ba8
|
hide header nav in desktop
|
2020-12-24 13:27:57 +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 |
|
Vladislav Makhov
|
79989f7bf4
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-12-24 10:21:02 +03:00 |
|
Artem Tarasov
|
ae682e2746
|
web: common: bump version
|
2020-12-24 10:16:16 +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 |
|
Vladislav Makhov
|
3cbf601f8d
|
Merge branch 'develop' into feature/desktop-view
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/store/auth/actions.js
|
2020-12-23 12:58:11 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
48463f897c
|
web: common: bump version
|
2020-12-22 11:51:31 +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
|
10979b7fa2
|
web: common: bump version
|
2020-12-21 18:45:39 +03:00 |
|
