Commit Graph

462 Commits

Author SHA1 Message Date
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
370696aba0 Web: Fixed property name for ColorTheme component, changed type => themeId 2022-08-31 15:38:39 +03:00
143193dd15 Web: Client: Profile: Fixed error after edit action from header menu 2022-08-31 15:10:50 +03:00
28e679f844 Merge branch 'develop' into bugfix/init-reset-stores 2022-08-31 14:09:19 +03:00
5d84a2c70d Web: Fix import 2022-08-31 14:08:43 +03:00
086c42f0a4 Web: Fix import 2022-08-31 14:07:55 +03:00
58c2b8b392 Merge branch 'develop' into bugfix/init-reset-stores 2022-08-31 11:42:02 +03:00
40ff56fb06
Merge branch 'develop' into bugfix/select-folder-dialog-editor-fix 2022-08-31 11:32:36 +03:00
Artem Tarasov
d8ad32240a Web: Client: SelectFolderDialog: fixed crash of app (editor) 2022-08-31 10:41:18 +03:00
225040fd19 PortalSettings: add toast 2022-08-31 05:27:59 +03:00
4ad6805624 PortalSettings: HistoryMainContent: disable buttons 2022-08-31 05:21:25 +03:00
Artem Tarasov
dc30ee143a Web: Client/Common/Components: changed prop name type to elementType in ColorTheme component 2022-08-31 02:20:25 +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
03f6553b01 Web: Fix Editor open 2022-08-30 16:54:09 +03:00
2d33893d50 PortalSettings: HistoryMainContent: fix button style 2022-08-30 16:47:19 +03:00
de5ce1fa1a Web: Fix TargetUserStore on Profile page 2022-08-30 16:19:00 +03:00
Artem Tarasov
e5545dd1f8 Web: Client: deleted login routes 2022-08-30 14:44:43 +03:00
a8e5175b57 Web: Fix undefined user in userStore after logout->login 2022-08-30 14:35:38 +03:00
c05307acaa PortalSettings: Security: hide settings button 2022-08-30 14:30:49 +03:00
b219b431f3 PortalSettings: HistoryMainContent: fix buttons style 2022-08-30 14:21:03 +03:00
6da7e16e52 Merge branch 'develop' into bugfix/init-reset-stores 2022-08-30 14:13:58 +03:00
55eae08689 PortalSettings: HistoryMainContent: fix input style 2022-08-30 14:13:14 +03:00
0488dc63d2 PortalSettings: Security: delete access rights 2022-08-30 14:03:45 +03:00
Artem Tarasov
0c4033869f Web: Login/Client: fixed login routes 2022-08-30 12:56:28 +03:00
9e949d52ad Update yarn.lock 2022-08-30 12:55:41 +03:00
778b27ed5c
Merge branch 'develop' into feature/security-history-audit 2022-08-30 12:55:38 +03:00
d0da69a74b
Merge branch 'develop' into feature/settings-menu 2022-08-30 12:11:59 +03:00
605aee5529 Merge branch 'develop' into feature/security-history-audit 2022-08-30 11:55:19 +05:00
3029650d85 Web: Client: create MainContent component 2022-08-30 11:53:54 +05:00
dc3ba67fea Web: Client: added DownloadReportBtn ru translation 2022-08-30 11:53:06 +05:00
Vlada Gazizova
2f822b0406
Merge branch 'develop' into feature/settings-common 2022-08-29 22:27:08 +03:00
b22c5464f5 Web:Client:Add IndicatorLoaderTheme. 2022-08-29 21:43:58 +03:00
c46fa39060 Merge branch 'develop' into bagfix/init-reset-stores
# Conflicts:
#	packages/client/src/store/FilesStore.js
#	packages/client/src/store/index.Files.js
2022-08-29 18:27:33 +03:00
d908ca1ce4 Web: Fix translation of ByLastModifiedDate key 2022-08-29 18:09:32 +03:00
646411c7d3 Web: Files: fixed infinite-scroll for thirdparty-folders 2022-08-29 17:38:01 +03:00
aca4d65f2b Merge branch 'develop' into feature/oforms-scroll 2022-08-29 17:32:48 +03:00
dc235a5bc9
Merge branch 'develop' into feature/create-room 2022-08-29 17:15:20 +03:00
mushka
4c33ef15ba added transition for thirdparty combobobx dropdown hover 2022-08-29 16:47:51 +03:00
mushka
4f1e8b860a added hover styles to iconCropper delete button 2022-08-29 16:47:32 +03:00
64893f12f9 Merge branch 'develop' into bugfix/backup 2022-08-29 16:42:57 +03:00
ed503875a2 Web: ManualBackup: Fixed memory leak. 2022-08-29 16:40:54 +03:00
69ecaa8df4 Merge branch 'develop' into feature/settings-menu 2022-08-29 16:37:58 +03:00
0359611cf3 Merge branch 'develop' into feature/oforms-scroll 2022-08-29 16:33:05 +03:00
091f90d2ff Web: Added missed import. 2022-08-29 16:28:54 +03:00
a5a2b4dc0b Web:Client:Add translation. 2022-08-29 16:25:45 +03:00
39a6776066 Web: Files: fixed Tile view 2022-08-29 16:18:18 +03:00
d25c8b1c8f Web:Client:Fix styles LoaderArticleBody. 2022-08-29 16:16:37 +03:00
2d91c42194 Web: Files: fixed filterTotal 2022-08-29 16:13:24 +03:00
20b6c667fd Web: Files: fixed roomsFilter total 2022-08-29 15:49:02 +03:00
f9c40397d5 Web: Files: restore hasMoreFiles logs 2022-08-29 15:43:52 +03:00