Commit Graph

631 Commits

Author SHA1 Message Date
TimofeyBoyko
f5030ea73d Web:Locales:RoomSelector: add new translation keys 2022-09-05 19:51:50 +03:00
3d8f0d8566 Web: Client: AddUsersPanel: Fixed PeopleSelector usage 2022-09-05 18:17:56 +03:00
661d39e5a6 Web: Locales: PeopleSelector: Added new translation keys 2022-09-05 18:17:17 +03:00
3befde4df2 Web: Client: PeopleSelector: Added base people selector with new selector body 2022-09-05 18:16:44 +03:00
055be3cdbe
Merge branch 'develop' into feature/accounts-scroll 2022-09-05 17:25:28 +03:00
2a4fa1862f
Merge branch 'develop' into feature/dns-settings 2022-09-05 16:31:17 +03:00
58df99c9a5 Web: Fix InfoPanel styled css 2022-09-05 15:16:38 +03:00
c27a8fc0d3 Web: People: added infinite-loader to accounts 2022-09-05 14:33:55 +03:00
TimofeyBoyko
a0df5d9a80 Web:Client: delete useless 2022-09-05 12:22:21 +03:00
TimofeyBoyko
0cf3ae3791 Web: delete useless code 2022-09-02 16:06:31 +03:00
TimofeyBoyko
41012a2919 Web:Client: add transltaion keys for user selector 2022-09-02 16:03:34 +03:00
TimofeyBoyko
24ff5342da Web:Client:Components: init user selector 2022-09-02 16:02:30 +03:00
18a6012d23 Merge branch 'develop' into feature/invite-panel 2022-09-02 15:42:50 +03:00
ac5210c8f8 Web: Client: InvitePanel: Fixed AddUsersPanel usage 2022-09-02 15:36:29 +03:00
7f18581cc8 Web: Client: InvitePanel: Added AddUsersPanel at InviteInput component 2022-09-02 15:35:27 +03:00
11b02e0aed Web: Client: AddUsersPanel: Fixed returned data model for invite panel 2022-09-02 15:34:21 +03:00
5a38bf68d9 Web: Client: DialogsStore: Fixed property name 2022-09-02 15:33:23 +03:00
1adc6c1cc5 Web:Client:Fix styles loaders Customization. 2022-09-02 14:50:28 +03:00
215b454008 Web:Client:Fix DNSSettingsTooltip. 2022-09-02 13:40:56 +03:00
5dadfdf652 Web:Client:Fix checkInnerWidth function. 2022-09-02 13:40:40 +03:00
Artem Tarasov
53fc9c848b Merge branch 'feature/login-ssr' of github.com:ONLYOFFICE/DocSpace into feature/login-ssr 2022-09-02 13:13:09 +03:00
e84ba1ff80 Merge branch 'develop' into feature/dns-settings 2022-09-02 13:05:58 +03:00
a37d345ce9 Web:Client:Add DNSSettingsTooltip. 2022-09-02 12:38:09 +03:00
3d7b27667f Web:Client:Add loader for DNSSettings. 2022-09-02 12:37:49 +03:00
3d5447bfa2 Web:Added translations for dns. 2022-09-02 12:37:00 +03:00
6787a92a97 Web:Client:Add DNSSettings styles. 2022-09-02 12:34:40 +03:00
66b30775fe Web:Client:Add DNSSettings. 2022-09-02 12:33:40 +03:00
72e4f84239 Web:Client:Fix styles customization settings. 2022-09-02 12:31:25 +03:00
8ce30932a3
Merge branch 'develop' into feature/login-ssr 2022-09-02 10:10:26 +03:00
c25aa53c79 Web: Info Panel: fix translation 2022-09-01 17:21:07 +03:00
ed60cd1a01 Web: Move to dialog: fix translation 2022-09-01 17:18:41 +03:00
Artem Tarasov
45bcfe4a8d Web: Login/Client: fixed parameter url name 2022-09-01 14:53:37 +03:00
Tatiana Lopaeva
f6d2c6e5b4
Merge branch 'develop' into feature/edit-ThirdPartyResourceDescription 2022-09-01 11:50:46 +03:00
2297a35fac Merge branch 'develop' into feature/invite-panel 2022-09-01 11:17:54 +03:00
8de4c5ee34 edited ThirdPartyResourceDescription zh-CN 2022-09-01 11:04:03 +03:00
Artem Tarasov
a845244ee0 Merge branch 'develop' into feature/login-ssr 2022-09-01 01:51:29 +03:00
Artem Tarasov
beed3b715a Web: Client: fixed crash after logout 2022-08-31 17:42:41 +03:00
TimofeyBoyko
184e998dc2 Web:Dialogs:ChangeEmailDialog: fix styles 2022-08-31 17:37:31 +03:00
47f4c557b4 edited key: ThirdPartyResourceDescription 2022-08-31 17:22:23 +03:00
TimofeyBoyko
3d73366c90 Web:Store:SelectionPeopleStore: fix authStore 2022-08-31 16:46:46 +03:00
TimofeyBoyko
ad5ecdb24b Web:Store:PeopleStore: delete useless store 2022-08-31 16:35:09 +03:00
TimofeyBoyko
34557b2e40 Merge branch 'develop' into feature/accounts-list 2022-08-31 16:31:29 +03:00
Artem Tarasov
4ad6140192 Web: Client: fix after merge 2022-08-31 16:28:24 +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
849591813d Merge branch 'develop' into feature/invite-panel 2022-08-31 15:53:14 +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
TimofeyBoyko
6a4b37711b Web:Client:UsersStore: fix getUsersList 2022-08-31 14:18:05 +03:00
c54817bfb1 Web: Client: InvitePanel: Fixed search result styles, added memo list. Fixed events on validating input value. Added "Сhoose from list" option 2022-08-31 14:17:38 +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
TimofeyBoyko
c942611c96 Web:AccountsHome:InfoPanel: delete useless code 2022-08-31 14:05:30 +03:00
TimofeyBoyko
33b6f7191f Web:Accounts: disable paid badge for info-panel 2022-08-31 14:04:14 +03:00
TimofeyBoyko
336d006945 Web:Accounts:Filter: update TODO 2022-08-31 12:48:53 +03:00
TimofeyBoyko
d15857e691 Web:Store:Accounts: add toastr for work at progress function 2022-08-31 12:38:31 +03:00
TimofeyBoyko
e53d7afba4 Web:Client:ChangeUserStatusDialog: fix mobx warning 2022-08-31 12:24:56 +03:00
TimofeyBoyko
d67c03188d Web:Pages:AccountsHome: add toastr for invite actions 2022-08-31 12:05:44 +03:00
TimofeyBoyko
f1aa658912 Web:Article:MainButton: add toast for invite 2022-08-31 12:00:05 +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
40ff56fb06
Merge branch 'develop' into bugfix/select-folder-dialog-editor-fix 2022-08-31 11:32:36 +03:00
TimofeyBoyko
52629d16df Web:Common:Filter: add support dark theme 2022-08-31 11:28:17 +03:00
Artem Tarasov
d8ad32240a Web: Client: SelectFolderDialog: fixed crash of app (editor) 2022-08-31 10:41:18 +03:00
TimofeyBoyko
938d354ae9 Web:Accounts: fix translation for info panel 2022-08-31 10:12:03 +03:00
66412730de Merge branch 'develop' into feature/invite-panel 2022-08-31 09:03:17 +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
TimofeyBoyko
5b2dc19436 Web:Accounts: fix delte profile ever dialog 2022-08-30 18:23:09 +03:00
6b25c3d7af Web: Client: InvitePanel: Added invitePanel at DialogsStore, added translation keys at InviteDialog, fixed adding and deleting operation with invite list, fixed styles of icons 2022-08-30 18:08:58 +03:00
TimofeyBoyko
ae4c5c6904 Web: change dir Accounts/Home to AccountsHome 2022-08-30 17:56:11 +03:00
TimofeyBoyko
199b3aff3c Web:Store:AccountsContextOptionsStore: fix invite again 2022-08-30 17:42:37 +03:00
TimofeyBoyko
44f434602a Web:Pages:Accounts: fix filter 2022-08-30 17:21:00 +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
TimofeyBoyko
143f9a148a Web:Accounts: delete withPeopleContextOptions HOC and add context group menu 2022-08-30 14:39:15 +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
TimofeyBoyko
2679f9f38e Web:Accounts:InfoPanel: fix scroll after open combobox 2022-08-30 11:33:08 +03:00
TimofeyBoyko
ff97d4a8f3 Web:Accounts:InfoPanel: add context menu 2022-08-30 10:48:21 +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
60086b1a68 Merge branch 'develop' into feature/invite-panel 2022-08-30 09:04:22 +03:00
38b217d65e Web: Client: InvitePanel: Added user search, added email validation, added editing for manual added items, fixed invite panel state 2022-08-30 08:55:19 +03: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