Commit Graph

22 Commits

Author SHA1 Message Date
Artem Tarasov
a845244ee0 Merge branch 'develop' into feature/login-ssr 2022-09-01 01:51:29 +03:00
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +03:00
Artem Tarasov
0621fd9c86 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/dialogs/ConnectDialog/index.js
#	packages/login/src/Login.jsx
#	packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	yarn.lock
2022-08-30 18:38:12 +03:00
e6e45ce2d7 Web:Common:Fix. 2022-08-29 22:43:29 +03:00
Vlada Gazizova
2f822b0406
Merge branch 'develop' into feature/settings-common 2022-08-29 22:27:08 +03:00
TimofeyBoyko
2c3dd7276d Merge branch 'develop' into feature/accounts-list 2022-08-29 18:22:45 +03:00
TimofeyBoyko
8c9db6685c Web:Common:Section: fix section width 2022-08-29 10:42:19 +03:00
04fb7ade63 Web: People: fixed row styles 2022-08-25 10:54:04 +03:00
Artem Tarasov
6f9120ee03 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/store/TargetUserStore.js
#	packages/common/store/AuthStore.js
#	packages/common/store/SettingsStore.js
#	packages/common/utils/index.ts
#	packages/login/src/Login.jsx
#	packages/login/src/RoomsLogin.jsx
2022-08-24 10:17:39 +03:00
a75f794d3f Web:Components:Change padding for settingsStudio. 2022-08-23 13:50:46 +03:00
1f2cceda94 Web: Common: hidden Selecto for infinite scroll 2022-08-22 14:38:00 +03:00
8e9d2c6d93 Web: Common: upgraded react-selecto 2022-08-22 14:30:42 +03:00
e5e1d966d1 Web: Files: restored paging, added withPaging parameter 2022-08-19 12:37:30 +03:00
0b1a8bf368 Web: Files: fixed infinite-scroll styles 2022-08-17 15:11:48 +03:00
4feba8a356 Merge branch 'develop' into feature/inifinite-scroll 2022-08-12 13:08:12 +03:00
7d691f6dcb Web: Common: fixed scroll 2022-08-12 11:00:42 +03:00
0de5d36ce4 Web: Files: Scroll: added WindowScroller 2022-08-09 13:43:24 +03:00
d0e4f67ec4 Merge branch 'develop' into feature/inifinite-scroll
# Conflicts:
#	packages/client/src/components/Article/Body/index.js
#	packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
#	packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
#	packages/client/src/pages/Home/Section/Body/TilesView/sub-components/InfiniteGrid.js
#	packages/client/src/pages/Home/Section/Body/TilesView/sub-components/StyledInfiniteGrid.js
#	packages/client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
#	packages/client/src/store/FilesStore.js
2022-08-09 09:49:28 +03:00
Artem Tarasov
a520446d69 Web: Packages: localStorage usage changed to cookies when saving language 2022-08-05 17:21:14 +03:00
f7b24248da Section: fix settings style 2022-08-04 01:36:19 +03:00
d093c97b97 Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00