Artem Tarasov 38e06018e5 Merge branch 'develop' into feature/doceditor-ssr ... # Conflicts: # packages/asc-web-common/api/client.js # products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/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/components/pages/Confirm/sub-components/changePassword.js # web/ASC.Web.Client/src/components/pages/Home/index.js # web/ASC.Web.Editor/src/Editor.jsx # web/ASC.Web.Editor/src/StyledEditor.js # yarn.lock		2022-04-28 14:12:06 +03:00
..
files	Web: Files: createFormFromTemplate replaced with createFile	2022-04-21 16:57:44 +03:00
groups	Web: People/Common: added sorting of groups in the tree	2021-11-16 19:27:27 +03:00
modules	Web: Proxy fixes	2021-03-22 17:35:33 +03:00
people	Web:Common:Api: add new api method 'changeTheme'	2022-04-21 10:23:06 +03:00
portal	merge	2022-03-24 20:56:51 +03:00
settings	Web: Files: fixed getOforms	2022-04-21 14:38:14 +03:00
user	Web: Common: API: add skipLogout option	2022-03-31 22:34:32 +03:00
client.js	Web: Common: add skipLogout option	2022-03-15 14:33:21 +03:00
index.js	Web: Common: chsnged component hierarchy	2021-02-25 11:04:22 +03:00