Commit Graph

6496 Commits

Author SHA1 Message Date
TatianaLopaeva
02df0294cf Web: Common: Removed inactive scrollbars in tablet view, horizontal scroll added to the end of the visible page height. 2021-01-13 15:21:06 +03:00
TatianaLopaeva
9bcb922c1a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	web/ASC.Web.Common/src/components/Layout/index.js
#	web/ASC.Web.Common/src/components/NavMenu/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2021-01-13 13:27:55 +03:00
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +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
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
Artem Tarasov
9e9cf3face web: components: bump version 2021-01-12 17:27:26 +03:00
Artem Tarasov
9df05a53c9 Web: Components: ModalDialog: fixed cursor type in modal 2021-01-12 17:27:03 +03:00
Artem Tarasov
adc795feb4 Web: Client: thirdPartySettings: changed the cursor to default 2021-01-12 13:24:44 +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
b2c6669e42 web: components: bump version 2020-12-30 19:45:01 +03:00
f40b347289
Merge branch 'develop' into feature/desktop-view 2020-12-30 19:42:59 +03:00
fc55550521
Merge pull request #166 from ONLYOFFICE/feature/asc-files-tests
Feature/asc files tests
2020-12-30 18:03:11 +03:00
Vladislav Makhov
44ba6f350f Merge branch 'develop' into feature/desktop-view 2020-12-30 16:20:47 +03:00
TatianaLopaeva
f3cfcdde7e Web: Common: Fixed displaying of article. 2020-12-30 14:08:48 +03:00
Artem Tarasov
3d7eada1a6 Web: Cluient/Files/People: fix for safari - disabled security zone (white stripes around the edges of the screen in landscape orientation 2020-12-30 12:15:50 +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
TatianaLopaeva
e6bc57c4b1 Web: Common: Removed jumps of header. 2020-12-30 10:08:31 +03:00
74aa0abca8 Bump version to v0.0.6 2020-12-29 19:43:37 +03:00
fa7c2bf9f1 Merge branch 'develop' into feature/asc-files-tests 2020-12-29 18:37:28 +03:00
7b4dc42620 Fix displaying header pre-loader on Desktop 2020-12-29 17:19:02 +03:00
TatianaLopaeva
f4b2922663 Web: Common: Fixed displaying of article header loading. 2020-12-29 16:36:08 +03:00
TatianaLopaeva
d988d44b11 Web: Common: Fixed displaying of aside header. 2020-12-29 16:15:24 +03:00
Vladislav Makhov
e6cf51575a Merge branch 'develop' into feature/desktop-view 2020-12-29 16:08:08 +03:00
TatianaLopaeva
8e64d66239 WEb: Common: Fixed displaying of article header. 2020-12-29 14:38:10 +03:00
TatianaLopaeva
300fcfde5d Web: Common: Fixed resize of article. 2020-12-29 14:34:56 +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
675599c57d web: components: bump version 2020-12-29 13:52:38 +03:00
Vladislav Makhov
7dfdae8a72 Merge branch 'develop' into feature/desktop-view 2020-12-29 09:33:55 +03:00
TatianaLopaeva
da06f84d49 Web: Common: Fixed z-index when drop down is open. 2020-12-28 19:35:55 +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
e6943a4544 Merge branch 'develop' into feature/11.0.2 2020-12-28 16:28:26 +03:00
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
TatianaLopaeva
6f8df750ba Web: Common: Refactoring. 2020-12-28 16:21:59 +03:00
TatianaLopaeva
a9d7228dcb Web: Common: Fixed padding-right of section. 2020-12-28 15:42:51 +03:00
TatianaLopaeva
78b7315a6e Web: Common/Components: Fixed the problem of updating data when switching from desktop to tablet view. 2020-12-28 15:34:05 +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
9f8ff83084 Update yarn.lock files 2020-12-25 16:24:26 +03:00
2b08c711dc Update Create-react-app to v4.0.1 2020-12-25 16:01:04 +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
20900eeb72 Merge branch 'master' into develop
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
2020-12-25 12:09:52 +03:00
TatianaLopaeva
e79eb283a3 Web: Common/People: Deleted useless scroll up. 2020-12-24 18:06:20 +03:00
TatianaLopaeva
9c7936327a Web: Common: Layout: Refactoring. 2020-12-24 18:03:51 +03:00
TatianaLopaeva
4e7b414c03 Web: Common/People: Fixed display downloading of profile & edit profile. 2020-12-24 18:02:49 +03:00
Vladislav Makhov
c9a5dd2ba8 hide header nav in desktop 2020-12-24 13:27:57 +03:00
9350f1189e Bump version to v0.0.5 2020-12-24 12:22:48 +03:00
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
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
Diana
e20b87447e Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2020-12-24 03:18:47 +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
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
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
Diana
9b338e0f78 Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop 2020-12-22 15:37:10 +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
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
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
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
60b172e8d8 Web: Components: fixed SelectedItem and SelectorAddButton click when components is disabled 2020-12-18 15:34:36 +03:00
Artem Tarasov
a965583c94 Merge branch 'hotfix/v0.0.4' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.4 2020-12-18 14:04:22 +03:00
Artem Tarasov
ba075ecc47 Web: Client: About: fixed copyright style 2020-12-18 14:04:11 +03:00
a2d97d2612 Web: About: Fixed SourceCode url 2020-12-18 11:42:29 +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
53f510ae18 Bump version to v0.0.4 2020-12-17 21:00:36 +03:00
Artem Tarasov
bbea13bb4b Web: Client: Confirm: changePassword fix 2020-12-17 19:49:20 +03:00
Artem Tarasov
51d07b5652 Web: Client: Confirm: refactoring 2020-12-17 19:37:52 +03:00
Artem Tarasov
68d6c1872f Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 19:28:24 +03:00
Artem Tarasov
5542a09575 Web: Clietn: Confirm: fixed redirect (changePassword) 2020-12-17 19:27:56 +03:00
326d234773 Update yarn.lock files 2020-12-17 18:35:04 +03:00
fb571c3ae6 web: common: bump version 2020-12-17 18:22:37 +03:00
76b04db830 Web: Common: Added VerstionBadge "Beta" 2020-12-17 18:21:48 +03:00
Artem Tarasov
9943d2c2ca web: common: bump version 2020-12-17 16:26:35 +03:00
Artem Tarasov
fceb96c386 Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 16:21:18 +03:00
Artem Tarasov
e0478dd2b3 web: common: bump version 2020-12-17 16:21:06 +03:00
Artem Tarasov
7851635005 Web: Client: Confirm: fix change password 2020-12-17 16:20:53 +03:00
Alexey Kostenko
e6d5c38059 web: common: bump version 2020-12-17 15:22:19 +03:00
Alexey Kostenko
fb2b591603 Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 14:54:24 +03:00
Alexey Kostenko
86ef386d1b web: common: bump version 2020-12-17 14:54:15 +03:00
Alexey Kostenko
b62695dc59 Web: Common: MediaViewer: Title style fix 2020-12-17 14:54:05 +03:00
Artem Tarasov
63c01a7ff6 Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 14:50:32 +03:00
Artem Tarasov
cacfabdd04 web: common: bump version 2020-12-17 14:49:52 +03:00
Artem Tarasov
16d738e5ca Web: Common/Client: changePassword: added logout if user is logged in 2020-12-17 14:49:30 +03:00