Viktor Fomin 2aed8eb3a0 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign ... # Conflicts: # packages/asc-web-components/index.js # packages/client/src/DocspaceLogo/index.js # packages/client/src/pages/Confirm/ConfirmWrapper.js # packages/components/form-wrapper/index.js # web/ASC.Web.Client/src/Shell.jsx # web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js # web/ASC.Web.Client/src/components/pages/Confirm/index.js # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/StyledConfirm.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/Confirm/sub-components/changePhone.js # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaActivation.js # web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaAuth.js # web/ASC.Web.Login/src/Login.jsx # web/ASC.Web.Login/src/StyledLogin.js		2022-08-10 16:16:43 +03:00
..
public	SSO: add translate	2022-08-08 13:55:23 +03:00
src	Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign	2022-08-10 16:16:43 +03:00
tests	Web: Merged 'Files' module with 'Client' and fixed paths	2022-07-24 19:57:03 +03:00
.babelrc	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
.env	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
.gitattributes	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
.gitignore	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
analyse.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
codecept.conf.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
Dockerfile	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
jsconfig.json	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
package.json	Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)	2022-08-01 15:37:33 +03:00
steps_file.js	Web: Client: Added missing code	2022-07-24 20:03:48 +03:00
steps.d.ts	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
webpack.config.js	Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)	2022-08-01 15:37:33 +03:00