Commit Graph

1389 Commits

Author SHA1 Message Date
TatianaLopaeva
7023cf5f3a Web: Transferring icons from a shared folder to modules. Icons are displayed by url. 2021-02-20 11:46:32 +03:00
TatianaLopaeva
af96aaf2b3 Web: Changed imports. 2021-02-01 16:10:02 +03:00
652c7bd906 Merge branch 'develop' into feature/workspaces
# Conflicts:
#	packages/asc-web-common/src/components/Layout/MobileLayout.js
#	packages/asc-web-common/src/components/Layout/ScrollToTop.js
#	packages/asc-web-common/src/components/Layout/context.js
#	packages/asc-web-common/src/components/Layout/index.js
#	packages/asc-web-common/src/components/NavMenu/index.js
#	packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
#	packages/asc-web-common/src/components/PageLayout/index.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/article.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-common/src/components/PageLayout/sub-components/section.js
#	packages/asc-web-components/src/components/icons/svg/button.cancel.react.svg
#	packages/asc-web-components/src/components/icons/svg/clear.active.react.svg
#	packages/asc-web-components/src/components/icons/svg/load.error.react.svg
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/App.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/src/components/pages/ProfileAction/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/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/yarn.lock
#	web/ASC.Web.Components/package.json
#	web/ASC.Web.Components/yarn.lock
#	yarn.lock
2021-01-29 16:39:00 +03:00
b0e8b9c6af Bump version to v0.0.10 2021-01-29 11:13:27 +03:00
TatianaLopaeva
a22e262310 Update yarn lock files 2021-01-28 16:18:22 +03:00
TatianaLopaeva
24ee58f0f6 Web: Files/People: Fixed height of context menu for desktop. 2021-01-28 10:45:44 +03:00
TatianaLopaeva
77ce035d15 Web: Files/People: Fixed context menu for desktop. 2021-01-27 20:01:52 +03:00
Artem Tarasov
93e6777b27 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Components/package.json
2021-01-27 18:03:12 +03:00
Viktor Fomin
32bfef070e Update yarn.lock files 2021-01-27 17:23:40 +03:00
b1dbaf7005 Web: Modified first templates 2021-01-27 15:38:35 +03:00
436bf7a06e Web: People: Added routes 2021-01-27 10:31:29 +03:00
30ab7edfcf Web: Fixed import errors 2021-01-27 10:29:15 +03:00
TatianaLopaeva
951961ad35 Web: Refactoring. 2021-01-26 18:21:50 +03:00
TatianaLopaeva
2b8dfc80e9 Web: Common/Files/People: Fixed "jumps" when go to the next page. 2021-01-26 13:50:29 +03:00
36c7a171df Web: Fixed load/unload People store 2021-01-26 13:36:05 +03:00
b9ed789746 Web: Applied WP:ModuleFederation best practices 2021-01-26 00:55:46 +03:00
TatianaLopaeva
4a961ad82c Web: Files/People: Added style condition for a mobile device. 2021-01-22 12:50:25 +03:00
3b43cfa334 Web: Files: fixed header styles 2021-01-21 18:43:48 +03:00
Artem Tarasov
cdecfc3ed3 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
#	web/ASC.Web.Client/src/App.js
2021-01-21 16:45:35 +03:00
TatianaLopaeva
1ed838e91e Web: Files/People: Changed the condition for scroll to top on mobile/tablet devices. 2021-01-20 22:13:23 +03:00
TatianaLopaeva
4c262c2854 Web: Common: Changed mobile layout only for mobile/tablet devices. 2021-01-20 21:04:00 +03:00
8d62eb5fbf Update yarn.lock files 2021-01-20 12:55:23 +03:00
3b959f81ed Bump version to v0.0.9 2021-01-18 19:06:31 +03:00
TatianaLopaeva
a4f416789a Merge branch 'develop' into feature/fix-hide/show-header 2021-01-18 12:02:40 +03:00
TatianaLopaeva
f14f83d1a1 Web: People/Files: Refactoring. 2021-01-15 17:55:18 +03:00
TatianaLopaeva
26c680010a Web: Common/People: Deleted useless imports. 2021-01-15 17:50:30 +03:00
7650acfec3 Bump version to v0.0.8 2021-01-15 13:03:47 +03:00
4ea47886f6 Bump version to v0.0.7 2021-01-14 17:56:05 +03:00
TatianaLopaeva
f0679f3cdf Web: Files/People: Fixed scrolling to the top when switching to a new page. 2021-01-13 16:19:20 +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
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
Artem Tarasov
3a9f3b6e02 Merge branch 'release/v0.0.6' of github.com:ONLYOFFICE/AppServer into release/v0.0.6 2020-12-30 12:16:26 +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
Ilya Oleshko
065ae43f0a Web: People : Profile : Fixed autofocus on mobile 2020-12-30 12:13:33 +03:00
74aa0abca8 Bump version to v0.0.6 2020-12-29 19:43:37 +03:00
TatianaLopaeva
5340bded2f Web: Common: Fixed displaying of article header at user profile. 2020-12-29 16:25:39 +03:00
TatianaLopaeva
d988d44b11 Web: Common: Fixed displaying of aside header. 2020-12-29 16:15:24 +03:00
39a0cb99de Update yarn.lock files 2020-12-29 14:03:05 +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
2be04b3bc0 Update package.json and yarn.lock files 2020-12-25 17:48:11 +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
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
4e7b414c03 Web: Common/People: Fixed display downloading of profile & edit profile. 2020-12-24 18:02:49 +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
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