|
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
|
3f27595995
|
Web: Login: fixed server build
|
2022-09-01 01:50:27 +03:00 |
|
Artem Tarasov
|
3e34505eed
|
Web: Login/Components: fixed styles
|
2022-09-01 01:14:24 +03:00 |
|
|
b96dc2425c
|
Api: fixed delete method
|
2022-08-31 22:27:30 +03:00 |
|
|
df96629834
|
Core: fixed user cache
|
2022-08-31 21:06:26 +03:00 |
|
Artem Tarasov
|
8c28fda299
|
Web: Login/ColorTheme: fixed ssr
|
2022-08-31 18:32:13 +03:00 |
|
Artem Tarasov
|
d8e98fa208
|
Web: Login: MoreLogin mf fix
|
2022-08-31 18:02:05 +03:00 |
|
|
49de93c89d
|
Merge pull request #782 from ONLYOFFICE/feature/accounts-list
Feature/accounts list
|
2022-08-31 17:55:53 +03:00 |
|
Artem Tarasov
|
beed3b715a
|
Web: Client: fixed crash after logout
|
2022-08-31 17:42:41 +03:00 |
|
TimofeyBoyko
|
9689bdc595
|
Merge branch 'feature/accounts-list' of github.com:ONLYOFFICE/DocSpace into feature/accounts-list
|
2022-08-31 17:38:11 +03:00 |
|
TimofeyBoyko
|
184e998dc2
|
Web:Dialogs:ChangeEmailDialog: fix styles
|
2022-08-31 17:37:31 +03:00 |
|
|
d18e8fb2e5
|
Merge branch 'feature/accounts-list' of github.com:ONLYOFFICE/DocSpace into feature/accounts-list
|
2022-08-31 17:34:08 +03:00 |
|
Artem Tarasov
|
04122f64fa
|
Web: Components/Common: added LoginStore support
|
2022-08-31 17:33:58 +03:00 |
|
|
29f9af8e90
|
Web: Fix authStore link
|
2022-08-31 17:33:54 +03:00 |
|
Artem Tarasov
|
1931e56f07
|
Web: Login: added LoginStore
|
2022-08-31 17:32:33 +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 |
|
|
409d05d23f
|
Merge pull request #783 from ONLYOFFICE/bugfix/init-reset-stores
Bugfix/init reset stores
|
2022-08-31 15:43:56 +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 |
|
|
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 |
|
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 |
|
|
66dd2fc7a4
|
Merge pull request #781 from ONLYOFFICE/bugfix/select-folder-dialog-editor-fix
Web: Client: SelectFolderDialog: fixed crash of app (editor)
|
2022-08-31 11:32:45 +03:00 |
|
|
40ff56fb06
|
Merge branch 'develop' into bugfix/select-folder-dialog-editor-fix
|
2022-08-31 11:32:36 +03:00 |
|
|
43b7f37a46
|
Merge pull request #777 from ONLYOFFICE/feature/security-history-audit
Feature/security history audit
|
2022-08-31 11:30:22 +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 |
|
|
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
|
9abb4081f3
|
Web: Common: linkForgotPassword: fix after merge (login-ssr - file hierarchy changed)
|
2022-08-30 18:51:02 +03:00 |
|
Artem Tarasov
|
c1a08ef15b
|
Web: rebuild yarn.lock (fix after merge)
|
2022-08-30 18:49:49 +03:00 |
|