Commit Graph

6842 Commits

Author SHA1 Message Date
TatianaLopaeva
9273fd82f4 Web: Common: Fixed auto scrolling down on ios. 2021-01-18 17:30:28 +03:00
TatianaLopaeva
97e6c6037a Web: Common: PageLayout: Fixed width of section-header, when width of article more than 240px. 2021-01-18 17:10:22 +03:00
TatianaLopaeva
a4f416789a Merge branch 'develop' into feature/fix-hide/show-header 2021-01-18 12:02:40 +03:00
83368921d3 web: common: bump version 2021-01-18 12:02:15 +03:00
35be26204c Web: Common: fixed SettingsFilesLoader width 2021-01-18 12:01:36 +03:00
ef22eb04c5 Web: Client: Fix third-party response page displaying 2021-01-15 18:15:07 +03:00
TatianaLopaeva
26c680010a Web: Common/People: Deleted useless imports. 2021-01-15 17:50:30 +03:00
TatianaLopaeva
f869209eee Web: Common: Fixed automatic scrolling down after loading the page. 2021-01-15 17:48:05 +03:00
Ilya Oleshko
8f3b4a60dd Web: Files: Added ThirdPartyResponse page error container, fixed router 2021-01-15 16:28:08 +03:00
TatianaLopaeva
f7fbbceeb6 Web: Common: Layout: Set height to 100% for mobile. 2021-01-15 16:05:54 +03:00
TatianaLopaeva
acbfd88658 Web: Common: Layout: Fixed issue with title not displaying when scrolling up. Fixed the disappearance of the header only if you can make the scroll larger than the width of the header and section header. 2021-01-15 16:04:34 +03:00
TatianaLopaeva
31d053bc13 Web: Common: Fixed the issue of not scrolling horizontally (touchpad). 2021-01-15 14:41:44 +03:00
90f81df4c7 Merge branch 'develop' into feature/thirdparty-integrations 2021-01-15 13:39:31 +03:00
7650acfec3 Bump version to v0.0.8 2021-01-15 13:03:47 +03:00
Ilya Oleshko
24127929aa Web: Files: Added ThirdParty response page, fixed oAuth connect/reconnect 2021-01-15 11:52:29 +03:00
TatianaLopaeva
d300de9839 Web: Common: PageLayout: Refactoring styles. 2021-01-15 10:04:24 +03:00
TatianaLopaeva
e6ba5cf5ab Web: Common: NavMenu: Deleted useless console.log. 2021-01-14 20:50:10 +03:00
TatianaLopaeva
3440ae9bb4 Web: Common: NavMenu/PageLayout: Fixed incorrect display of the modal dialog, as a result of which the appeared problems with z-index in the Navigation Menu were fixed & Refactoring. 2021-01-14 20:44:59 +03:00
4ea47886f6 Bump version to v0.0.7 2021-01-14 17:56:05 +03:00
TatianaLopaeva
e0980d3b02 Web: Common: PageLayout: Fixed animation of section header visibility. 2021-01-14 14:16:09 +03:00
4c6538f849 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-14 11:00:18 +03:00
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
2848c39c57 Merge branch 'develop' into feature/thirdparty-integrations 2021-01-14 10:14:46 +03:00
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
889949eb95 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/Layout/index.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/HistoryRowsLoader.stories.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/README.md
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/StyledHistoryRowsLoader.js
#	packages/asc-web-common/src/components/Loaders/HistoryRowsLoader/index.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section.js
#	packages/asc-web-common/src/desktop/index.js
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/dialogs/DownloadDialog/DownloadContent.js
#	products/ASC.Files/Client/src/components/pages/DocEditor/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
#	products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/helpers/confirmRoute.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/pages/login/i18n.js
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	web/ASC.Web.Login/src/LoginContent.jsx
#	yarn.lock
2021-01-11 12:21:59 +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
Diana
fada5e278b Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests 2020-12-17 13:20:52 +03:00
Artem Tarasov
3daee8efbb Web: Client: Confirm: fixed api method call 2020-12-17 12:38:23 +03:00
c573e23b0b Merge branch 'hotfix/v0.0.3' of github.com:ONLYOFFICE/AppServer into hotfix/v0.0.3 2020-12-17 12:37:41 +03:00
3815a57394 Update yarn.lock files 2020-12-17 12:37:28 +03:00
Artem Tarasov
b565bfc77c Web: Client: Confirm: fixed crash of the app when trying to change pass if the user is authorized on the portal 2020-12-17 12:32:58 +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
6e5fc07016 web: common: bump version 2020-12-17 11:13:38 +03:00
a6a6a1361c Web: Common: fixed getCurrentUserId selector 2020-12-17 11:09:12 +03:00
41bca489bb Fixed versions (About version) 2020-12-16 19:09:56 +03:00
Artem Tarasov
0ee4acb133 Web: Common: Layout: refactoring 2020-12-16 14:38:20 +03:00
Artem Tarasov
d036b52fa1 Web: Common: Layout: fixed change orientation chrome (ios) 2020-12-16 13:58:05 +03:00
cbb0c75492 Web: Common: added employeeStatus to PeopleSelector 2020-12-16 11:37:50 +03:00
TatianaLopaeva
ef50248de5 Web: Common: GroupSelector: Refactoring. 2020-12-16 10:57:20 +03:00
4afadf2e0c Web: Added support of public folders + moved back to original index.html 2020-12-15 19:27:30 +03:00
c9293ac86d Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/FilterInput/FilterInput.js
#	packages/asc-web-common/src/components/FilterInput/sub-components/SortComboBox.js
#	packages/asc-web-common/src/components/PageLayout/index.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/article-body.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/article-header.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/article-main-button.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/pages/DocEditor/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	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/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/ContactField.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/EmailField.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
#	products/ASC.People/Client/src/index.js
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Client/src/App.js
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
#	web/ASC.Web.Client/src/helpers/confirmRoute.js
#	web/ASC.Web.Client/src/index.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	web/ASC.Web.Login/src/LoginContent.jsx
#	web/ASC.Web.Login/src/sub-components/register-container.js
#	yarn.lock
2020-12-15 18:40:27 +03:00
e542f2b54e Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-15 17:59:18 +03:00
Artem Tarasov
91bce60705 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-15 16:33:01 +03:00
Artem Tarasov
61ea05ca2d web: components: bump version 2020-12-15 15:49:35 +03:00
TatianaLopaeva
fcc2d2f5a8 Web: Common: PageLayout: Refactoring. 2020-12-15 14:10:07 +03:00
TatianaLopaeva
90780cb631 Web: Common: PageLayout: Fixed displaying of article. 2020-12-15 14:09:22 +03:00
TatianaLopaeva
eb0743a3ad Web: Common/People/Files: Added simplified functionality of scrolling up when switching to a new page. 2020-12-15 14:08:14 +03:00
Artem Tarasov
a66d5c59c6 Web: Common: Layout: refactoring 2020-12-15 13:40:29 +03:00
Artem Tarasov
12c7d62796 Web: Common: Layout: fixed inability to sctroll after changing orientation, added swithing from tabletView to desktop 2020-12-15 13:26:56 +03:00
Vladislav Makhov
b748693676 Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/App.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/Header/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Components/src/components/row/index.js
2020-12-15 11:00:54 +03:00
4027ca9599 Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-15 10:56:50 +03:00
cbc8888057 Merge branch 'develop' into feature/thirdparty-integrations 2020-12-15 10:55:15 +03:00
Artem Tarasov
59f80038e4 web: common: bump version 2020-12-15 10:11:30 +03:00
Artem Tarasov
287be4e83f web: common: bump version 2020-12-15 10:11:21 +03:00
TatianaLopaeva
5eb1230dc1 Web: Common: PageLayout: Fixed after merge 2020-12-14 21:39:01 +03:00
TatianaLopaeva
0dd8f2858a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
2020-12-14 21:30:39 +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
0c615d470b Web: Took the information about the width of the window from the store 2020-12-14 19:50:54 +03:00
Ilya Oleshko
f43a2562dd web: common: bump version 2020-12-14 18:41:53 +03:00
Ilya Oleshko
bdb433ae35 Web: Common : Api: Fixed default filter sort order 2020-12-14 18:41:44 +03:00
Artem Tarasov
ad42652fdc Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/Layout/index.js
2020-12-14 18:20:58 +03:00
Artem Tarasov
b154b4bcc8 Web: Common: Layout: added isTabletView flag to store 2020-12-14 18:16:21 +03:00
Artem Tarasov
8e0104920b Web: Common: Layout: fixed isTablet 2020-12-14 17:20:26 +03:00
TatianaLopaeva
ae5b128285 Web: Common: Layout: Refactoring 2020-12-14 16:40:20 +03:00
45001f0dcf Web: Common: added owner change api 2020-12-14 15:07:27 +03:00
15420cb96b Web: Files: fixed ShareAccessRights constants 2020-12-14 15:06:24 +03:00
Vladislav Makhov
9381090ccd Remove unused code 2020-12-14 09:19:13 +03:00
Vladislav Makhov
03e29cdec7 Remove unused code 2020-12-14 09:15:38 +03:00
TatianaLopaeva
89f5cb670c web: common: bump version 2020-12-11 18:44:44 +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
Artem Tarasov
94240cc1c7 Web: Components: paging: fixed width dd 2020-12-11 16:33:02 +03:00
Alexey Kostenko
a20af486ad web: common: bump version 2020-12-11 16:00:06 +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
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
1b825e4cfa Web: Common: PageLayout: fixed condition for trigger stopping if current element is undefined 2020-12-11 11:54:07 +03:00
f70e6e907f Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-11 11:34:23 +03:00
TatianaLopaeva
8f0dba2be2 Web: Common: PageLayout: Fixed after merged 2020-12-11 11:20:52 +03:00
TatianaLopaeva
c9a8027ddf 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/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.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.Components/package.json
2020-12-11 11:12:28 +03:00
Artem Tarasov
eaa436f28f Web: Components: backdrop: fixed class name 2020-12-11 10:20:42 +03:00
169c25d9bb Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
2020-12-11 10:04:19 +03:00
Artem Tarasov
b49c41929b web: components: bump version 2020-12-10 20:49:27 +03:00
Artem Tarasov
7d5cb10068 web: common: bump version 2020-12-10 20:49:11 +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
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
8c4be9ab6d Merge branch 'bugfix/upload-with-convertation' of github.com:ONLYOFFICE/AppServer into bugfix/upload-with-convertation 2020-12-10 19:15:44 +03:00
2548dba9b7 Web: Files: Fixed opening file on external link 2020-12-10 19:15:36 +03:00
356ace1c57 Merge branch 'develop' into bugfix/upload-with-convertation 2020-12-10 19:14:58 +03:00
0b0d7187e0 Update yarn.lock files 2020-12-10 18:45:49 +03:00
be497b0f3a web: common: bump version 2020-12-10 18:38:49 +03:00
b85faae56b Web: Common: fixed filter update 2020-12-10 18:41:42 +03:00
419fe93913
Merge branch 'develop' into bugfix/toast 2020-12-10 18:37:17 +03:00
Ilya Oleshko
5906b2f914 Merge branch 'develop' into feature/thirdparty-integrations 2020-12-10 16:25:44 +03:00
dff5391b68 Merge branch 'develop' into bugfix/sharing-panel-refactoring 2020-12-10 15:07:14 +03:00
Alexey Kostenko
3e448ce90e web: common: bump version 2020-12-10 14:27:47 +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
TatianaLopaeva
8e455a134f web: components: bump version 2020-12-10 11:49:00 +03:00
Alexey Kostenko
1a53841499 Web: Files/People/Common: Fixed header style 2020-12-10 09:48:35 +03:00
09ce302b57 Web: Files: Init new conversation process 2020-12-09 18:37:24 +03:00
2e0762b2c3 Merge branch 'develop' into bugfix/upload-with-convertation
# Conflicts:
#	products/ASC.Files/Client/src/store/files/actions.js
2020-12-09 16:19:03 +03:00
Artem Tarasov
2c6616bafe Web: Components: paging: fixed width of dropdown with list of pages' 2020-12-09 16:13:05 +03:00
86325f87ba Web: Common: fixed sharing api 2020-12-09 15:37:34 +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
254b03032f Web: Common: Fixed status of undefined 2020-12-09 13:52:47 +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
Vladislav Makhov
509ce245ac Comment out shouldComponentUpdate (temporary) 2020-12-09 11:30:21 +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
4d88b2fc28 Update yarn.lock files 2020-12-08 18:37:19 +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
06d6994b34 web: common: bump version 2020-12-08 18:26:38 +03:00
Alexey Kostenko
b0903aa99b Web: Common: added CustomFilter constant 2020-12-08 18:25:17 +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
Alexey Kostenko
96e946491a web: common: bump version 2020-12-08 17:45:08 +03:00
7d3dde38c4 Update yarn.lock files 2020-12-08 15:26:54 +03:00
9f778af8bd web: common: bump version 2020-12-08 15:13:29 +03:00
42bfa9a3a6 Merge branch 'bugfix/sharing-settings' of github.com:ONLYOFFICE/AppServer into bugfix/sharing-settings 2020-12-08 15:12:42 +03:00
694daae135 Fixed redirection to default page if already logged-in 2020-12-08 15:12:33 +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
Ilya Oleshko
d2719e1cd9 Web: Fixed usage lodash/isEqual on fast-deep-equal 2020-12-08 14:09:46 +03:00
Ilya Oleshko
bd13067d0b Web: Added fast-deep-equal 2020-12-08 14:08:26 +03:00
Artem Tarasov
5446a6a24d Merge branch 'develop' into feature/version-hostory-redesign 2020-12-08 14:03:01 +03:00
Artem Tarasov
f632890cf2 web: common: bump version 2020-12-08 13:40:32 +03:00
Artem Tarasov
6af035a131 web: components: bump version 2020-12-08 13:40:18 +03:00
Artem Tarasov
31a8e30ee9 Web: Components: drop-down: refactoring 2020-12-08 13:40:12 +03:00
Artem Tarasov
52f0c1f96b Web: Components/Files: fix bugs, refactoring 2020-12-08 13:33:58 +03:00
TatianaLopaeva
34583dde7f Web: Common: Added logic for toasts that stack on top of each other and line up one after the other when clicked 2020-12-08 13:15:22 +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
Artem Tarasov
5a6469dffa Web: Components: backdrop: fixed collapse conditions dropdowns 2020-12-08 09:49:07 +03:00
Viktor Fomin
d9e95dabab Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-07 21:03:07 +03:00
TatianaLopaeva
47653a2999 web: common: bump version 2020-12-07 19:02:21 +03:00
TatianaLopaeva
f2a3355ae8 Web: Common: Changed import for selector getLanguage 2020-12-07 19:01:10 +03:00
Vladislav Makhov
9c2238ad60 Comment out shouldComponentUpdate (temporary) 2020-12-07 17:33:01 +03:00
Vladislav Makhov
7ff435e5be Fix circular dependencies 2020-12-07 17:32:00 +03:00
Vladislav Makhov
2c1c8dedb0 Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
2020-12-07 16:03:47 +03:00
Viktor Fomin
982ce4e12c
Merge branch 'develop' into feature/floating-button 2020-12-07 14:50:49 +03:00
Viktor Fomin
2be2085655 Update yarn.lock files 2020-12-07 14:48:09 +03:00
Alexey Kostenko
d873db91ca web: common: bump version 2020-12-07 14:13:31 +03:00
Alexey Kostenko
b1373ddef7 web: components: bump version 2020-12-07 14:13:21 +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
7c51353970 Moved ModuleTile into Home page 2020-12-07 11:35:36 +03:00
Ilya Oleshko
4147d2f31a Web: Fixed temp loaders 2020-12-07 11:11:04 +03:00
71b6e9f27d Web: Files: init Files build and loading (Moved out from CRA) 2020-12-07 10:49:07 +03:00
Alexey Kostenko
3c2c0140c4 Web: Components: Added prop "color" to TextArea component 2020-12-07 10:40:18 +03:00
Ilya Oleshko
830fbfb6a3 web: common: bump version 2020-12-07 09:52:39 +03:00
Ilya Oleshko
049f7971f1 web: components: bump version 2020-12-07 09:52:29 +03:00
Ilya Oleshko
83466bd638 Merge branch 'develop' into bugfix/login-fix 2020-12-07 09:52:04 +03:00
Ilya Oleshko
cd100eba85 Web: Client: Fixed redirect after actions 2020-12-07 09:43:40 +03:00
70aa6c023d Web: Added dynostore for people reducers loading 2020-12-06 20:15:01 +03:00
2baf8cbc76 Fixed confirm link user creation 2020-12-04 17:15:00 +03:00
Artem Tarasov
93da24a63a Web: Common/Files/People: fixed z-index 2020-12-04 14:58:37 +03:00
Artem Tarasov
089e398fed Web: Components: drop-down: fixed passing props style 2020-12-04 14:58:05 +03:00
0784453daf Fix errors on login and logout 2020-12-04 14:21:51 +03:00
Alexey Kostenko
ab71a6dd33 Web: Files/Common: Refactoring, changing access type to external share link 2020-12-04 14:09:31 +03:00
Vladislav Makhov
a3bd0823c6 Refactoring 2020-12-04 12:59:48 +03:00
Vladislav Makhov
18bec4ee4b fix updateFileStream 2020-12-04 12:59:16 +03:00
Vladislav Makhov
72b9a10e82 Fix dispatch error 2020-12-04 12:13:51 +03:00
TatianaLopaeva
7a93541db6 web: components: bump version 2020-12-04 11:59:59 +03:00
Ilya Oleshko
c32fc83399 Web: Client: Fixed property name, added missing property 2020-12-04 11:58:15 +03:00
TatianaLopaeva
452ca3b558 web: common: bump version 2020-12-04 11:57:33 +03:00
Artem Tarasov
55928c4207 web: common: bump version 2020-12-04 11:52:40 +03:00
Artem Tarasov
4a8ba1493f web: components: bump version 2020-12-04 11:52:31 +03:00
Artem Tarasov
1ea04f44bb Merge branch 'develop' into bugfix/dropdown-fix 2020-12-04 11:51:31 +03:00
Artem Tarasov
ffcfc11587 Web: Components: Backdrop: fixed backdrop overlay 2020-12-04 11:50:21 +03:00
Artem Tarasov
06c132777a Web: Common/Components: removed binding to id, added passing and binding className 2020-12-04 11:41:56 +03:00
Ilya Oleshko
d03584fcdd Web: Fixed isAuthenticated logic 2020-12-04 11:38:15 +03:00
Artem Tarasov
51595ac11a Web: Common/Components: applying a new backdrop/dropdown hiding mechanic 2020-12-04 00:21:48 +03:00
Artem Tarasov
5c3bac7720 Web: Components: Backdrop/DropDown: fixed work of hiding backdrop in dropdown 2020-12-04 00:20:29 +03:00
Artem Tarasov
839fee8cd3 Merge branch 'develop' into bugfix/dropdown-fix 2020-12-03 20:46:17 +03:00
Alexey Kostenko
14031d121e Web: Files/Common: Style fix 2020-12-03 18:14:11 +03:00
4574c6172a web: components: bump version 2020-12-03 18:10:05 +03:00
aa3cf1df49 web: common: bump version 2020-12-03 18:09:55 +03:00
a39192ff21 Web: Common: added new containers styles, added classNames to people and files containers 2020-12-03 18:03:05 +03:00
d4e5208115 Web: Components: removed margin-top from row-container 2020-12-03 18:00:16 +03:00
Alexey Kostenko
5fe44c3976 Web: Files/Common: Change access type to external link, refactoring, applied prettier style fix 2020-12-03 15:18:38 +03:00
1ed59c1694 Web: People: init People build and loading (Moved out from CRA) 2020-12-03 13:09:33 +03:00
Vladislav Makhov
45ca67e7b8 Add form data 2020-12-03 12:11:52 +03:00
Artem Tarasov
cdcd5a6aff Web: Common: Layout: fixed bug when changing orientation from portrait to landscape (ios-chrome) 2020-12-03 11:25:08 +03:00
Artem Tarasov
96bfc3f8f9 Web: Common: Layout: refactoring 2020-12-03 11:02:19 +03:00
Vladislav Makhov
3064eb302b Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	web/ASC.Web.Common/src/pages/login/index.js
2020-12-03 09:59:20 +03:00
Vladislav Makhov
925a619a2f Refactoring, add replaceFileStream 2020-12-02 16:43:28 +03:00
Vladislav Makhov
1fbdd82dae Add updateFileStream, rename getEncryptionSupport to getIsEncryptionSupport 2020-12-02 16:42:45 +03:00
Vladislav Makhov
95c13950cb Refactoring 2020-12-02 16:42:10 +03:00
Alexey Kostenko
094af7ddab Web: Common: Added access types externalLink 2020-12-02 15:30:17 +03:00
Artem Tarasov
be710bf469 Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header 2020-12-02 15:29:13 +03:00
Artem Tarasov
543f855c28 Web: Common: Layout: refactoring, moved orientation change tracking to Layout 2020-12-02 15:28:37 +03:00
TatianaLopaeva
32db9d737e Merge branch 'develop' into feature/fix-hide/show-header 2020-12-02 12:55:04 +03:00
Alexey Kostenko
d63a012929 Web: Components: Fixed warning 2020-12-02 11:05:06 +03:00
Alexey Kostenko
23b209b85c Merge branch 'develop' into bugfix/sharing-settings 2020-12-02 09:14:36 +03:00
Artem Tarasov
bf5aefb64c Web: Common: Layout/PageLayout/Main: refactoring 2020-12-01 23:39:38 +03:00
Artem Tarasov
e0a147bb38 Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header 2020-12-01 20:29:14 +03:00
Artem Tarasov
65dc3d5f43 Web: Common: Layout/PageLayout: fixed component rendering bugs when changing orientation(ios-safari) 2020-12-01 20:28:22 +03:00
Artem Tarasov
fec2e6d685 Web: Common: NavMenu/Layout: refactoring 2020-12-01 20:24:35 +03:00
Ilya Oleshko
2858b3f7ca Merge branch 'develop' into bugfix/login-fix 2020-12-01 16:41:52 +03:00
9b611dee3c Auth. ia auth: allow anonymous 2020-12-01 16:40:38 +03:00
Viktor Fomin
86425fac97 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-12-01 16:31:17 +03:00
Viktor Fomin
0d1f1a4599 Update yarn.lock files 2020-12-01 16:26:13 +03:00
88adb06b46 Web: Fixed loading data from public/ folder 2020-12-01 15:50:05 +03:00
7260e67902 Web: Fixed port conflict with OnlyofficeApiSystemService 2020-12-01 14:39:54 +03:00
f1119a3afd Web: Fixed Login/logout working 2020-12-01 13:45:27 +03:00
c963f2f2a3 Web: Added concurrently run of apps + fixed CORS problems 2020-12-01 13:02:31 +03:00
Ilya Oleshko
8dd7badfd3 Merge branch 'develop' into bugfix/login-fix 2020-12-01 12:33:21 +03:00
228c304211 Merge branch 'develop' into feature/asc-files-tests 2020-12-01 12:29:36 +03:00
88117bcd00 Authentication: read method 2020-12-01 11:22:10 +03:00
d78912fd32 Web: Client: Added NavMenu 2020-12-01 11:05:39 +03:00
f1bcf02a11 Web: Client: Added support of sass files 2020-12-01 10:53:38 +03:00
TatianaLopaeva
2cebf625fc Merge branch 'develop' into feature/fix-hide/show-header 2020-12-01 10:45:48 +03:00
15d13179ff web: Fixed start ASC.Web.Client 2020-12-01 10:40:01 +03:00
TatianaLopaeva
748e4d3e97 Web: Common: Added check for tablet into componentDidUpdate and componentDidMount 2020-11-30 19:31:21 +03:00
Alexey Kostenko
d9b7a53f29 Web: Common: Updated api "openEdit", "setExternalAccess" 2020-11-30 18:38:20 +03:00
7c136b576e Web: Common: fixed register text align 2020-11-30 16:40:42 +03:00
Artem Tarasov
e946eb42e0 Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header 2020-11-30 16:15:20 +03:00
TatianaLopaeva
caf6fd1034 Web: Common: Fixed scrolling down when going to a profile from the user list (IOS) 2020-11-30 16:09:53 +03:00
TatianaLopaeva
9c2f3d4cc3 Web: Common: Fixed scroll down when switching from profile editing to user profile (Android) 2020-11-30 16:06:50 +03:00
Ilya Oleshko
ebe385e5a3 web: common: bump version 2020-11-30 15:59:42 +03:00
Ilya Oleshko
4b20b62223 Web: Common : PageLayout : Fixed css 2020-11-30 15:59:27 +03:00
Ilya Oleshko
2ee49e80d9 Merge branch 'develop' into bugfix/login-fix 2020-11-30 15:56:30 +03:00
Viktor Fomin
2c8b384ef1 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/floating-button 2020-11-30 15:17:48 +03:00
Vladislav Makhov
813c9c4b1d Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	web/ASC.Web.Common/src/components/NavMenu/index.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/actions.js
2020-11-30 15:16:49 +03:00
Ilya Oleshko
051032bfbb Merge branch 'develop' into bugfix/login-fix 2020-11-30 15:13:06 +03:00
f10f6b8d3b Update yarn.lock files 2020-11-30 15:11:23 +03:00
Ilya Oleshko
a7ac057201 web: common: bump version 2020-11-30 15:03:21 +03:00
325e548ee3 web: common: bump version 2020-11-30 15:03:14 +03:00
Ilya Oleshko
3c0381c03f web: components: bump version 2020-11-30 15:03:08 +03:00
d0abe7666f Common: Fixed empty screen on login page on IOS 2020-11-30 15:02:57 +03:00
Ilya Oleshko
292dc42d52 Web: Components : Input, Textarea : Fixed placeholder color 2020-11-30 15:02:56 +03:00
Ilya Oleshko
22d8111191 Web: Common : Login : Fixed display login error 2020-11-30 15:02:09 +03:00
34798781d2 Merge branch 'bugfix/login-fix' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into bugfix/login-fix 2020-11-30 15:02:22 +03:00
30b5c5781f Web: Components: fixed avatar background color 2020-11-30 15:02:15 +03:00
Ilya Oleshko
2f8a82727f web: common: bump version 2020-11-30 13:47:16 +03:00
Ilya Oleshko
f8fc428bd0 Web: Common : Login : Fixed white screen on ios 2020-11-30 13:46:52 +03:00
4ad116937a Merge branch 'develop' into bugfix/fix-empty-screen-description 2020-11-30 13:27:35 +03:00
96b5b2658b Web: Common: fixed text alignment on login page 2020-11-30 13:20:58 +03:00
Ilya Oleshko
f8cb5ab12c web: common: bump version 2020-11-30 13:06:19 +03:00
Ilya Oleshko
fcd4313402 Web: Common : Login : Fixed white screen on ios 2020-11-30 13:05:49 +03:00
172d93040b Web: Client: init frame work 2020-11-30 11:35:50 +03:00
5e10d983f3 Web: Components: fixed display of tooltip in password input 2020-11-28 15:36:33 +03:00
8c965fa4e1 Web: People: changed empty screen description, fixed icons alignment 2020-11-28 13:44:31 +03:00
d280c474ac Web: Components: fixed date-picker styled, refactoring 2020-11-28 13:25:01 +03:00
b65ef058e1 Web: Components: fixed alignment of icons 2020-11-28 13:21:02 +03:00
f1b4176527 Web: Components: fixed alignment of icons 2020-11-28 13:16:25 +03:00
bc1e8e80a8 Web: Components: Grid: fixed gridColumnGap prop, added export 2020-11-28 13:13:28 +03:00
a6174d184c Web: Components: added default color prop to help-button 2020-11-28 13:10:58 +03:00
a22742671d Web: Components: fixed input-block icons size 2020-11-28 13:09:56 +03:00
165001aad8 Web: Components: fixed tree-menu catalog color 2020-11-28 13:09:08 +03:00
97e033ac68 Web: Components: fixed text alignment in the buttons 2020-11-28 13:06:57 +03:00
13757f9dae Web: Components: updated icons 2020-11-28 13:01:18 +03:00
9b10672daf Web: Client: init re-write to webpack 5 2020-11-27 20:40:38 +03:00
Artem Tarasov
ec058e8dd2 Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
2020-11-27 20:23:33 +03:00
TatianaLopaeva
b067d86753 Web: Common: Changed the logic of displaying downloads for tablet / mobile (removed jumps when downloading) 2020-11-27 18:47:44 +03:00
Vladislav Makhov
38fac0b348 web: common: fix styles 2020-11-27 18:44:27 +03:00
Vladislav Makhov
25a4032a2a web: common: revert commit 2020-11-27 18:43:51 +03:00
Vladislav Makhov
3e58e6d7c0 web: common: add styled wrapper 2020-11-27 18:43:22 +03:00
Vladislav Makhov
d1524afa5a web: common: remove unused code 2020-11-27 18:42:46 +03:00
TatianaLopaeva
aa9db75c77 Web: Common: Changed the logic of displaying downloads for tablet / mobile (removed jumps when downloading) 2020-11-27 18:05:06 +03:00
Vladislav Makhov
7569475bbb web: common: move Register to Login 2020-11-27 18:02:48 +03:00
Vladislav Makhov
8b8abad778 web: client: remove Register from App.js 2020-11-27 17:53:34 +03:00
Vladislav Makhov
5f733577d9 web: common: fix enableJoin prop 2020-11-27 17:48:10 +03:00
Vladislav Makhov
4daa055d38 Merge branch 'develop' into bugfix/register-block 2020-11-27 16:59:19 +03:00
Vladislav Makhov
e46d755520 web: common: update prop types 2020-11-27 16:57:19 +03:00
Vladislav Makhov
83385dd2e4 web: common: bump version 2020-11-27 16:55:31 +03:00
Vladislav Makhov
c6cc0f0a1f web: client: fix register block view 2020-11-27 16:55:12 +03:00
Vladislav Makhov
65976a3b75 web: common: fix register block view 2020-11-27 16:55:00 +03:00
Alexey Kostenko
06b29a5cb9 Web: Common: Added api "set external access" 2020-11-27 15:55:36 +03:00
b18e47492a Web: Files: fixed selection and deselection of service files 2020-11-27 15:38:15 +03:00
Viktor Fomin
81eb054d75 Web: Common: fixed icon position 2020-11-27 14:49:16 +03:00
Artem Tarasov
4908e77f07 Web: Components: dropdown/group-buttons-menu/backdrop: fixed mechanism for hiding disabled items 2020-11-27 14:15:39 +03:00
daf30eebae Merge branch 'develop' into feature/thirdparty-integrations 2020-11-27 11:34:05 +03:00
TatianaLopaeva
e64b93da30 Merge branch 'develop' into feature/fix-hide/show-header 2020-11-27 11:22:50 +03:00
d2a3382b17 web: components: bump version 2020-11-27 10:59:15 +03:00
2210f0f6ba Web: Components: fixed row icons alignment 2020-11-27 10:58:30 +03:00
Artem Tarasov
9e68de8a24 Web: Common: MobileLayout: fixed header jumps (ios, mac) and incorect positioning Profile(ios) 2020-11-26 22:53:42 +03:00
40546da35d fix create file 2020-11-26 20:30:57 +03:00
d34e9354a8 Login: webpack fixed warning 2020-11-26 19:42:15 +03:00
2ac11ba49f Login: restored modals 2020-11-26 19:41:43 +03:00
d9d68b1633 Fixed import dependencies 2020-11-26 19:40:54 +03:00
3272910d8e web: components: bump version 2020-11-26 16:46:58 +03:00
dc5e2ff4a2 Web: Components: fixed icons in row-content 2020-11-26 16:43:31 +03:00
Artem Tarasov
5c735f551c Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header 2020-11-26 16:37:41 +03:00
Artem Tarasov
13d5418859 Web: Common: MobileLayout: fixed hiding header when microscrolling, switching to another page 2020-11-26 16:37:27 +03:00