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 |
|
|
|
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 |
|
|
|
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 |
|
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
|
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 |
|
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
|
73f2983177
|
Web: Login: added build scripts
|
2022-08-30 18:13:12 +03:00 |
|
Artem Tarasov
|
bc0e986707
|
Web: Login/Common: added language cookie setting on the server
|
2022-08-30 17:50:54 +03:00 |
|
Artem Tarasov
|
7e487bb064
|
Web: Login: deleted unnecessary code
|
2022-08-30 17:39:27 +03:00 |
|
|
|
50659cdeb9
|
Common: ColorTheme: fix
|
2022-08-30 17:03:45 +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 |
|
|
|
db4e491ea9
|
Web: Files: fixed InfiniteLoaderComponent height
|
2022-08-30 15:41:09 +03:00 |
|
Artem Tarasov
|
ee7986e7bb
|
Web: Login: added getting language from portal settings, removed accept-language-parser
|
2022-08-30 15:00:31 +03:00 |
|
Artem Tarasov
|
e5545dd1f8
|
Web: Client: deleted login routes
|
2022-08-30 14:44:43 +03:00 |
|
Artem Tarasov
|
b5c3e0b241
|
Web: Login: deleted unnecessary files
|
2022-08-30 14:42:20 +03:00 |
|
Artem Tarasov
|
25c1672e30
|
Web: Login: RoomsLogin moved to Login
|
2022-08-30 14:41:09 +03:00 |
|
Artem Tarasov
|
456166a7d5
|
Web: Login: RoomsLogin moved to Login
|
2022-08-30 14:40:46 +03:00 |
|
|
|
a786e19afa
|
Web: Components: fixed InfiniteLoaderComponent crash
|
2022-08-30 14:37:58 +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 |
|
|
|
58424f1674
|
Components: TableContainer: add showSettings prop
|
2022-08-30 14:30:23 +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
|
bf925aeeed
|
Web: Login: added types for IS_PERSONAL, IS_ROOMS_MODE
|
2022-08-30 13:30:29 +03:00 |
|
Artem Tarasov
|
044fd627e5
|
Web: Login: added support for rooms mode in webpack
|
2022-08-30 13:28:51 +03:00 |
|
Artem Tarasov
|
8a15cbc331
|
Web: Login: deleted console.log
|
2022-08-30 12:57:05 +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 |
|
|
|
a20a4ac9e1
|
Merge pull request #778 from ONLYOFFICE/feature/settings-menu
Feature/settings menu
|
2022-08-30 12:52:44 +03:00 |
|
|
|
d0da69a74b
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-30 12:11:59 +03:00 |
|
|
|
21ee981bba
|
Merge pull request #762 from ONLYOFFICE/feature/settings-common
Feature/settings common
|
2022-08-30 12:01:11 +03:00 |
|
|
|
5829654183
|
Web:Common:Fix.
|
2022-08-30 10:35:24 +03:00 |
|
