|
980b27b1c3
|
Merge branch 'develop' into bugfix/fixed-page-loading
|
2022-09-07 13:57:48 +03:00 |
|
|
8e79c919a7
|
Web: Files: fixed settings selection
|
2022-09-07 13:51:18 +03:00 |
|
TimofeyBoyko
|
d8a6315417
|
Web:Client:Locales: fix RoomSelector translation key
|
2022-09-07 13:33:19 +03:00 |
|
TimofeyBoyko
|
e1b4b4e4b8
|
Web:Client:RoomSelector: add 100 as const to calc page
|
2022-09-07 13:31:32 +03:00 |
|
TimofeyBoyko
|
64a847b1a8
|
Web:Client:RoomSelector: fix calc page
|
2022-09-07 13:21:33 +03:00 |
|
|
76f06d958c
|
Web: Files: fixed page loading
|
2022-09-07 13:02:48 +03:00 |
|
|
a3e3d7855f
|
Web: Fix Table row height (Applied design styles)
|
2022-09-07 12:45:39 +03:00 |
|
|
7da6d9c031
|
Web: Accounts: Applied design styles
|
2022-09-07 12:27:46 +03:00 |
|
TimofeyBoyko
|
2f821e92d4
|
Web:Client:Pages: integrate RoomSelector for review
|
2022-09-07 11:47:57 +03:00 |
|
TimofeyBoyko
|
3923d6faec
|
Merge branch 'develop' into feature/change-owner-dialog
|
2022-09-06 17:43:00 +03:00 |
|
TimofeyBoyko
|
67cdfd1a9e
|
Merge branch 'feature/selector' of github.com:ONLYOFFICE/DocSpace into feature/selector
|
2022-09-06 16:55:17 +03:00 |
|
TimofeyBoyko
|
65c879c04b
|
Web:Client:RoomSelector: fix default props
|
2022-09-06 16:53:46 +03:00 |
|
|
f66c0bb91f
|
Web: Client: Renamed locale folders
|
2022-09-06 13:18:35 +03:00 |
|
|
c9cdcd08af
|
Web: Client: AddUsersPanel: Fixed PeopleSelector usage
|
2022-09-06 13:14:48 +03:00 |
|
TimofeyBoyko
|
c09ac8862f
|
Web:Client:RoomSelector: delete useless code
|
2022-09-06 13:05:25 +03:00 |
|
TimofeyBoyko
|
611c635620
|
Web:Client:RoomSelector: refactoring
|
2022-09-06 12:24:22 +03:00 |
|
TimofeyBoyko
|
6c632497f9
|
Merge branch 'develop' into feature/selector
|
2022-09-05 20:33:29 +03:00 |
|
TimofeyBoyko
|
2c16a10639
|
Web:Client:RoomSelector: add excludeItems prop
|
2022-09-05 20:32:28 +03:00 |
|
TimofeyBoyko
|
cb3549622c
|
Web:Client:Components: init room selector
|
2022-09-05 19:54:35 +03:00 |
|
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 |
|
|
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 |
|
|
89f9e10f84
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-09-02 01:24:12 +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 |
|
|
8de4c5ee34
|
edited ThirdPartyResourceDescription zh-CN
|
2022-09-01 11:04:03 +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
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
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 |
|
|
547c1782f1
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
|
2022-08-30 12:34:48 +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 |
|
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 |
|
TimofeyBoyko
|
2c3dd7276d
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 18:22:45 +03:00 |
|
|
d908ca1ce4
|
Web: Fix translation of ByLastModifiedDate key
|
2022-08-29 18:09:32 +03:00 |
|
|
4993a35168
|
PortalSettings: WhiteLabel: fix save
|
2022-08-29 17:56:59 +03:00 |
|
TimofeyBoyko
|
8d893e6641
|
Web:Accounts: move contextOptions from HOCs to store
|
2022-08-29 17:42:14 +03:00 |
|
|
646411c7d3
|
Web: Files: fixed infinite-scroll for thirdparty-folders
|
2022-08-29 17:38:01 +03:00 |
|
|
aca4d65f2b
|
Merge branch 'develop' into feature/oforms-scroll
|
2022-08-29 17:32:48 +03:00 |
|
TimofeyBoyko
|
8bc35aa337
|
Web:Pages:Accounts: fix warnings
|
2022-08-29 17:29:23 +03:00 |
|
TimofeyBoyko
|
40655be681
|
Web:Pages:Accounts: add bufferSelection to info panel
|
2022-08-29 17:29:07 +03:00 |
|
TimofeyBoyko
|
48d5fb87c4
|
Web:Store:DiaglogStore: add new dialogs for changing owner and changing user name
|
2022-08-29 17:28:47 +03:00 |
|
TimofeyBoyko
|
9381f5783a
|
Web:Pages:Accounts: clear selection after click
|
2022-08-29 17:27:05 +03:00 |
|
TimofeyBoyko
|
a9bd9677c1
|
Web:Pages:Accounts: add buffer selection
|
2022-08-29 17:26:42 +03:00 |
|
|
8ab27efaef
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-29 17:19:16 +03:00 |
|
|
dc235a5bc9
|
Merge branch 'develop' into feature/create-room
|
2022-08-29 17:15:20 +03:00 |
|
mushka
|
4c33ef15ba
|
added transition for thirdparty combobobx dropdown hover
|
2022-08-29 16:47:51 +03:00 |
|
mushka
|
4f1e8b860a
|
added hover styles to iconCropper delete button
|
2022-08-29 16:47:32 +03:00 |
|
|
64893f12f9
|
Merge branch 'develop' into bugfix/backup
|
2022-08-29 16:42:57 +03:00 |
|
|
ed503875a2
|
Web: ManualBackup: Fixed memory leak.
|
2022-08-29 16:40:54 +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 |
|
|
091f90d2ff
|
Web: Added missed import.
|
2022-08-29 16:28:54 +03:00 |
|
|
a5a2b4dc0b
|
Web:Client:Add translation.
|
2022-08-29 16:25:45 +03:00 |
|
|
39a6776066
|
Web: Files: fixed Tile view
|
2022-08-29 16:18:18 +03:00 |
|
|
d25c8b1c8f
|
Web:Client:Fix styles LoaderArticleBody.
|
2022-08-29 16:16:37 +03:00 |
|
|
2d91c42194
|
Web: Files: fixed filterTotal
|
2022-08-29 16:13:24 +03:00 |
|
|
20b6c667fd
|
Web: Files: fixed roomsFilter total
|
2022-08-29 15:49:02 +03:00 |
|
|
f9c40397d5
|
Web: Files: restore hasMoreFiles logs
|
2022-08-29 15:43:52 +03:00 |
|
|
8f28612519
|
Web: Files: fixed hasMoreFiles
|
2022-08-29 15:41:13 +03:00 |
|
|
d4ebaa1b49
|
Web: Files: added logs to hasMoreFiles
|
2022-08-29 14:39:30 +03:00 |
|
|
3e6c19221f
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-29 14:01:52 +03:00 |
|
|
45935a2ace
|
Web: Change order of loading stores + added reset People/Files stores on logout
|
2022-08-29 13:58:30 +03:00 |
|
mushka
|
b75f9f5ec8
|
implemented new translation keys
|
2022-08-29 13:50:00 +03:00 |
|
mushka
|
435e15b217
|
added enw translation keys for dropzone
|
2022-08-29 13:49:43 +03:00 |
|
|
048492de36
|
Web:Client:Fix styles loader SectionHeader.
|
2022-08-29 13:48:48 +03:00 |
|
|
67a6c0225d
|
Web:Client:Fix styles loader ArticleBody.
|
2022-08-29 13:48:38 +03:00 |
|
mushka
|
ed0f4058c4
|
hid folderInput and toRemember checkbox
|
2022-08-29 13:42:18 +03:00 |
|
mushka
|
de114290ab
|
added new theme-driven colors to folderInput
|
2022-08-29 13:41:51 +03:00 |
|
mushka
|
e3df63716c
|
fixed default tag in TagList
|
2022-08-29 13:41:10 +03:00 |
|
mushka
|
ae55313516
|
tweaked previewTile
|
2022-08-29 13:40:49 +03:00 |
|
mushka
|
3807afb3ea
|
added missing translation key
|
2022-08-29 13:40:08 +03:00 |
|
TimofeyBoyko
|
6c676c6ade
|
Web:Client: update context menu of users
|
2022-08-29 12:24:50 +03:00 |
|