Commit Graph

156 Commits

Author SHA1 Message Date
dba3e03b53 Web: Components: renamed Selector to SelectionArea, fixed select 2022-09-07 11:30:50 +03:00
b8dbd00617 Web: Components: added selection-area 2022-09-06 13:53:12 +03:00
cb1da48faf Web: Profile: fix selected language 2022-09-06 12:52:57 +03:00
055be3cdbe
Merge branch 'develop' into feature/accounts-scroll 2022-09-05 17:25:28 +03:00
c27a8fc0d3 Web: People: added infinite-loader to accounts 2022-09-05 14:33:55 +03:00
Artem Tarasov
44b8ecd6b5 Web: Login/Common: fixed crash app after logout. 2022-09-05 10:48:46 +03:00
Artem Tarasov
a845244ee0 Merge branch 'develop' into feature/login-ssr 2022-09-01 01:51:29 +03:00
Artem Tarasov
8c28fda299 Web: Login/ColorTheme: fixed ssr 2022-08-31 18:32:13 +03:00
Artem Tarasov
04122f64fa Web: Components/Common: added LoginStore support 2022-08-31 17:33:58 +03:00
TimofeyBoyko
34557b2e40 Merge branch 'develop' into feature/accounts-list 2022-08-31 16:31:29 +03:00
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
TimofeyBoyko
073b37aa86 Web:Common:Filter: fix after merge 2022-08-31 11:48:40 +03:00
58c2b8b392 Merge branch 'develop' into bugfix/init-reset-stores 2022-08-31 11:42:02 +03:00
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +03:00
TimofeyBoyko
52629d16df Web:Common:Filter: add support dark theme 2022-08-31 11:28:17 +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
9abb4081f3 Web: Common: linkForgotPassword: fix after merge (login-ssr - file hierarchy changed) 2022-08-30 18:51:02 +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
Artem Tarasov
bc0e986707 Web: Login/Common: added language cookie setting on the server 2022-08-30 17:50:54 +03:00
50659cdeb9 Common: ColorTheme: fix 2022-08-30 17:03:45 +03:00
6da7e16e52 Merge branch 'develop' into bugfix/init-reset-stores 2022-08-30 14:13:58 +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
TimofeyBoyko
b737830e69 Web:Common:Api: delete useless code 2022-08-30 11:57:06 +03:00
5829654183 Web:Common:Fix. 2022-08-30 10:35:24 +03:00
605aee5529 Merge branch 'develop' into feature/security-history-audit 2022-08-30 11:55:19 +05: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
d8d40b1ae1 Web:Common:Add SliderTheme, IndicatorLoaderTheme. 2022-08-29 21:42:47 +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
TimofeyBoyko
2c3dd7276d Merge branch 'develop' into feature/accounts-list 2022-08-29 18:22:45 +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
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
efafaf51d8 Web:Common:Fix styles ArticleHeader. 2022-08-29 16:15:33 +03:00
45935a2ace Web: Change order of loading stores + added reset People/Files stores on logout 2022-08-29 13:58:30 +03:00
1c660c75e8 Web:Client:Fix loader ArticleHeader. 2022-08-29 13:49:15 +03:00
mushka
18b56dbc3e Merge branch 'develop' into feature/create-room 2022-08-29 12:36:47 +03:00
3413367480
Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 12:21:19 +03:00
e3e47364e0 Merge branch 'develop' into feature/security-history-audit 2022-08-29 13:36:09 +05:00
24ece95419 Web: Fix invalid plugins check on login 2022-08-29 11:29:08 +03:00
9dfe51c614 Web: Common: added oforms filter 2022-08-29 11:28:05 +03:00
1078c7f138 Web: Common: fixed getOforms 2022-08-29 11:27:13 +03:00
TimofeyBoyko
8c9db6685c Web:Common:Section: fix section width 2022-08-29 10:42:19 +03:00
8abc7f4095 Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 09:51:34 +03:00
TimofeyBoyko
937d99249e Merge branch 'develop' into feature/accounts-list 2022-08-29 09:47:42 +03:00
Vlada Gazizova
302e2e655a
Merge branch 'develop' into feature/settings-common 2022-08-27 12:17:44 +03:00
Artem Tarasov
c7d70c5263 Web: Common: ErrorContainer: removed unnecessary init store (fix ssr crash) 2022-08-27 01:52:33 +03:00