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
..
api	Merge branch 'develop' into feature/sso	2022-08-02 12:05:15 +03:00
components	Section: fix settings style	2022-08-04 01:36:19 +03:00
constants	Web: Upgrade yarn to v3.2.2	2022-07-29 18:20:57 +03:00
desktop	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
history	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
hoc	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
store	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso	2022-08-06 23:12:39 +03:00
sw	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
utils	Common: Utils: Added methods for interacting with integration frame: frameCallbackData, frameCallCommand	2022-08-04 13:29:42 +03:00
browserslist-config-asc.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
custom.scss	Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign	2022-08-10 16:16:43 +03:00
fonts.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
index.js	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
opensansoffline.scss	Web: Moved all clients app to packages directory	2022-07-22 22:01:25 +03:00
package.json	Web: Upgrade yarn to v3.2.2	2022-07-29 18:20:57 +03:00