Commit Graph

178 Commits

Author SHA1 Message Date
4b3f9f7e29 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/components/dialogs/index.js
2022-09-09 17:34:19 +03:00
TimofeyBoyko
14052af9b7 Web:Common:Article: fix displaying role for profile avatar 2022-09-09 09:27:36 +03:00
06803de440 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/components/dialogs/BackupCodesDialog/index.js
#	packages/client/src/pages/My/index.js
#	packages/client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	packages/client/src/pages/Profile/Section/Body/index.js
#	packages/client/src/pages/ProfileAction/Section/Body/avatarEditorPage.js
#	packages/client/src/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
#	packages/client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	packages/client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	packages/client/src/pages/ProfileAction/index.js
2022-09-08 17:31:12 +03:00
97bd153ec5
Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 16:29:09 +03:00
b5ce007715 Web: Common: fixed SortButton render 2022-09-08 16:05:06 +03:00
eb291c85ef Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-08 15:43:05 +03:00
TimofeyBoyko
3a3ae4b2c9 Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 15:16:51 +03:00
024826b64a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-08 13:09:25 +03:00
d7bd44cfb1 Web: Files: fixed hover for row 2022-09-08 11:48:06 +03:00
TimofeyBoyko
5f0f71a2bf Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 11:27:49 +03:00
a94fc40294
Merge branch 'develop' into bugfix/fixed-section-body-padding 2022-09-08 10:57:54 +03:00
TimofeyBoyko
9d0c6c0a97 Merge branch 'develop' into feature/change-owner-dialog 2022-09-08 10:49:30 +03:00
6977534102
Merge branch 'develop' into feature/selector 2022-09-08 10:35:53 +03:00
4c949e6c1a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-07 23:21:46 +03:00
baa59e701b Common: Article: fix zIndex 2022-09-07 23:11:00 +03:00
d8c101f907 Web: Common: fixed section-body padding styles for row view 2022-09-07 18:16:02 +03:00
d0d2313da3 Web: Files: fixed section-body styles 2022-09-07 17:00:17 +03:00
TimofeyBoyko
ac496bfe9e Merge branch 'develop' into feature/selector 2022-09-07 15:06:24 +03:00
41c58de5c7 Web: Common: FilterInput: Fixed PeopleSelector usage 2022-09-07 14:14:09 +03:00
TimofeyBoyko
3923d6faec Merge branch 'develop' into feature/change-owner-dialog 2022-09-06 17:43:00 +03:00
cb1da48faf Web: Profile: fix selected language 2022-09-06 12:52:57 +03:00
TimofeyBoyko
adf02df9cf Web:Common:Loaders: add display of user loader for selector row loader 2022-09-06 12:17:52 +03:00
TimofeyBoyko
6c632497f9 Merge branch 'develop' into feature/selector 2022-09-05 20:33:29 +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
TimofeyBoyko
a3f37b0362 Web:Common:Loaders: add loaders for selector search and row 2022-09-05 12:00:48 +03:00
Artem Tarasov
44b8ecd6b5 Web: Login/Common: fixed crash app after logout. 2022-09-05 10:48:46 +03:00
TimofeyBoyko
4d74c6d6da Web:Client: add change portal owner dialog 2022-09-01 10:44:49 +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