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
..
fonts	Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF	2021-07-27 15:56:19 +03:00
images	Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign	2022-08-10 16:16:43 +03:00
locales	Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso	2022-07-26 19:02:17 +03:00
offline	Web: Removed duplicates	2021-09-24 21:18:50 +03:00
scripts	Web: Integration: Fixed parsing property from script url	2022-08-05 17:03:04 +03:00
thirdparty	Web: Fixed callback pages, added login callback for desktop client	2021-10-19 10:31:34 +03:00
appIcon-180.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
appIcon-192.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
appIcon-512.png	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
bg-error.png	PWA: renamed images for pwa	2019-12-11 15:18:55 +03:00
favicon.ico	Web: Removed duplicates	2021-09-24 21:18:50 +03:00
icon.svg	Web: Client: Added new icons for browser shortcuts	2022-05-27 14:55:04 +03:00
manifest.json	Web: Client: Fixed manifest.json for apply new icons	2022-05-27 14:56:16 +03:00