Artem Tarasov 4ac1eb4c5c Merge branch 'develop' into feature/login-ssr ... # Conflicts: # packages/client/src/components/Badges.js # packages/client/src/components/IndicatorLoader/index.js # packages/client/src/components/QuickButtons.js # packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js # packages/client/src/pages/About/AboutContent.js # packages/client/src/pages/Confirm/sub-components/activateEmail.js # packages/client/src/pages/Home/InfoPanel/Header/index.js # packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js # packages/client/src/store/TargetUserStore.js # packages/common/components/ColorTheme/ColorTheme.js # packages/common/components/FilterInput/sub-components/FilterBlockItem.js # packages/common/components/FilterInput/sub-components/FilterButton.js # packages/common/components/FloatingButton/FloatingButton.js # packages/common/components/Navigation/sub-components/item.js # packages/common/store/AuthStore.js # packages/components/badge/index.js # packages/components/button/index.js # packages/components/calendar/index.js # packages/components/catalog-item/index.js # packages/components/combobox/sub-components/combo-button.js # packages/components/input-block/index.js # packages/components/main-button/index.js # packages/components/submenu/index.js # packages/components/tabs-container/index.js # packages/components/text-input/text-input.js # packages/components/textarea/index.js # packages/components/toggle-button/index.js # packages/login/src/Login.jsx		2022-08-31 16:25:55 +03:00
..
public	Merge branch 'develop' into feature/login-ssr	2022-08-31 16:25:55 +03:00
src	Merge branch 'develop' into feature/login-ssr	2022-08-31 16:25:55 +03:00
tests	Web: Merged 'Files' module with 'Client' and fixed paths	2022-07-24 19:57:03 +03:00
.babelrc	Web: Editor/Client: added ts support	2022-08-17 10:21:43 +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	Merge branch 'develop' into feature/login-ssr	2022-08-30 18:38:12 +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: Editor/Client: added ts support	2022-08-17 10:21:43 +03:00