TimofeyBoyko
|
124a955ef2
|
Web:Client:Accounts: add info-panel for user
|
2022-08-22 10:05:44 +03:00 |
|
|
76425d4134
|
Web: Files: fixed setViewAs
|
2022-08-19 14:11:58 +03:00 |
|
|
e5e1d966d1
|
Web: Files: restored paging, added withPaging parameter
|
2022-08-19 12:37:30 +03:00 |
|
mushka
|
cff96d5a25
|
fixed deleted state passing
|
2022-08-19 04:12:43 +03:00 |
|
mushka
|
47faf5d832
|
removed unused file
|
2022-08-19 04:11:00 +03:00 |
|
mushka
|
eec3be8ba4
|
updated and cleaned up events
|
2022-08-19 04:10:49 +03:00 |
|
mushka
|
f59de045fe
|
tryouts for editRoom icon restructure
|
2022-08-19 04:09:52 +03:00 |
|
mushka
|
3e4a036cb0
|
permanent settings update and tweak
|
2022-08-19 04:09:00 +03:00 |
|
mushka
|
e9b451598d
|
tweaked ThirdpartyComboBox
|
2022-08-19 04:08:15 +03:00 |
|
mushka
|
35102131f1
|
fixed imports in IconCropper
|
2022-08-19 04:07:39 +03:00 |
|
mushka
|
ca65ccbb68
|
fixed props passing from setRoomParams
|
2022-08-19 04:07:18 +03:00 |
|
mushka
|
9028432bf6
|
updated and fixed tagInput + changed default tag functionality
|
2022-08-19 04:06:48 +03:00 |
|
mushka
|
fa2275b0e8
|
passed default tag to previewTile + started working on default tag change
|
2022-08-19 04:05:58 +03:00 |
|
mushka
|
c187ffade5
|
fixed and updated roomType
|
2022-08-19 04:02:39 +03:00 |
|
mushka
|
8ce7810566
|
created new view for RoomTypeDropdown on mobile
|
2022-08-19 04:02:17 +03:00 |
|
mushka
|
b8ee0b66e0
|
updated yarn.lock and package.json
|
2022-08-18 17:05:36 +03:00 |
|
TimofeyBoyko
|
90fc57c925
|
Web:Client:Accounts: update group menu
|
2022-08-18 15:37:55 +03:00 |
|
TimofeyBoyko
|
bc8d2916f1
|
Web:Client: add new translation keys
|
2022-08-18 15:37:15 +03:00 |
|
TimofeyBoyko
|
545605ef16
|
Web: Client: add new icons for accounts group menu
|
2022-08-18 15:36:29 +03:00 |
|
|
457200198a
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-18 15:29:50 +03:00 |
|
|
8fefd3debb
|
Merge branch 'develop' into feature/create-room
|
2022-08-18 11:25:02 +03:00 |
|
|
a6ddc6937c
|
Web: Files: fixed deleteAction toast
|
2022-08-18 10:46:22 +03:00 |
|
TimofeyBoyko
|
37210c90f3
|
Web:Client:Pages: increase section header height for home and accounts pages
|
2022-08-18 10:10:47 +03:00 |
|
|
c8676289a6
|
Web: Files: Hotkeys: fixed scrollToCaret
|
2022-08-17 17:55:05 +03:00 |
|
|
896f86fde4
|
Web: Files: fixed hotkeys scroll
|
2022-08-17 17:30:55 +03:00 |
|
|
2afade9016
|
Web: Files: Hotkeys: added throttle to keydown event
|
2022-08-17 17:16:49 +03:00 |
|
|
0b1a8bf368
|
Web: Files: fixed infinite-scroll styles
|
2022-08-17 15:11:48 +03:00 |
|
TimofeyBoyko
|
82753e9c6b
|
Web:Client:Accounts: hide paid badge
|
2022-08-17 14:51:07 +03:00 |
|
TimofeyBoyko
|
4da9a3a43d
|
Web:Client:Article: show accounts item only for admins
|
2022-08-17 14:50:43 +03:00 |
|
TimofeyBoyko
|
54c5352fd9
|
Web:Client:Accounts: add translation keys for empty screen
|
2022-08-17 14:50:21 +03:00 |
|
TimofeyBoyko
|
b8a5f121e3
|
Web:Client: add new translation keys for accounts empty screen page
|
2022-08-17 14:49:53 +03:00 |
|
|
fe7140c21d
|
Web: ManualBackup: fixed after merge.
|
2022-08-17 13:34:05 +03:00 |
|
|
f0ff24b065
|
Web: Deleted useless code.
|
2022-08-17 12:57:34 +03:00 |
|
|
f08679dd2d
|
Web: Deleted useless code.
|
2022-08-17 12:54:20 +03:00 |
|
TimofeyBoyko
|
2dfb779793
|
Web:Client:Accounts: update combobox view for table view
|
2022-08-17 12:10:40 +03:00 |
|
TimofeyBoyko
|
f44a49710e
|
Web:Client:Accounts: add translation keys for section body
|
2022-08-17 11:20:47 +03:00 |
|
TimofeyBoyko
|
59486ab21e
|
Web:Client:Accounts: add translation keys for section header
|
2022-08-17 10:29:33 +03:00 |
|
TimofeyBoyko
|
6ab3da7752
|
Web:Client:Article: add translation keys for main button of accounts page
|
2022-08-16 18:45:54 +03:00 |
|
TimofeyBoyko
|
c8cf18030e
|
Web:Client: add new key for en locale 'Manager'
|
2022-08-16 18:43:04 +03:00 |
|
TimofeyBoyko
|
76dac756f1
|
Web:Client:Accounts: add translation key 'Paid' for paid badge
|
2022-08-16 18:35:28 +03:00 |
|
TimofeyBoyko
|
12f59e8e35
|
Web:Client:Accounts: update position for badges on row view
|
2022-08-16 18:23:47 +03:00 |
|
TimofeyBoyko
|
9c220ab77b
|
Web:Client:Accounts: update colors and add new paid badge for accounts
|
2022-08-16 17:27:46 +03:00 |
|
|
b65b7c75e5
|
Move translates from NavMenu to Login
|
2022-08-16 16:26:00 +03:00 |
|
|
774b445c16
|
Web: Files: fixed removeFiles, fixed filterTotal
|
2022-08-16 16:16:33 +03:00 |
|
TimofeyBoyko
|
2633a0ed18
|
Web:Client:Accounts: update action menu for section header
|
2022-08-16 16:15:54 +03:00 |
|
|
fe37848cdc
|
Web: Files: Row: fixed itemHeight
|
2022-08-16 16:15:05 +03:00 |
|
TimofeyBoyko
|
1a1cbccd13
|
Web:Client:Acctouns: update table and row view
|
2022-08-16 13:29:30 +03:00 |
|
TimofeyBoyko
|
12c98c2cb8
|
Web:Client: rename PeopleBadges to Badges and move to accounts section
|
2022-08-16 13:29:08 +03:00 |
|
|
fc12eb4873
|
NavMenu: delete useless
|
2022-08-16 12:33:09 +03:00 |
|
|
ddc24796fe
|
NavMenu: delete recover access
|
2022-08-16 12:26:42 +03:00 |
|
mushka
|
6d7dd140cd
|
commented out react-avatar-editor dependancy
|
2022-08-15 19:13:15 +03:00 |
|
mushka
|
218b94b5b6
|
commented out unfinished room params
|
2022-08-15 19:07:59 +03:00 |
|
mushka
|
0a686b6731
|
added react-avatar-editor dependency
|
2022-08-15 19:06:46 +03:00 |
|
TimofeyBoyko
|
74c2180584
|
Web:Client:Accounts: update empty screen
|
2022-08-15 18:07:50 +03:00 |
|
|
5d3c98ea91
|
Web: Files: fixed fetch files
|
2022-08-15 17:41:39 +03:00 |
|
|
9ccf6055ea
|
Web: Updated icons.
|
2022-08-15 17:33:36 +03:00 |
|
|
29187803e5
|
Web: Deleted useless code.
|
2022-08-15 17:24:41 +03:00 |
|
|
c65e01a988
|
Web: Files: fixed fetch files
|
2022-08-15 17:22:50 +03:00 |
|
|
8537afcbcf
|
Web: Deleted useless code.
|
2022-08-15 17:22:20 +03:00 |
|
|
fd37c07afc
|
Web: added translations.
|
2022-08-15 17:17:56 +03:00 |
|
|
e3d7f4cee8
|
Web: Added translations.
|
2022-08-15 17:03:55 +03:00 |
|
|
bfcc420e66
|
Web: Fixed bugs after merge.
|
2022-08-15 16:42:15 +03:00 |
|
|
0f869ed987
|
Web: Changed title.
|
2022-08-15 16:36:16 +03:00 |
|
|
21f8dd92fd
|
Web: Added disconnect button.
|
2022-08-15 16:26:27 +03:00 |
|
mushka
|
4379a34bcf
|
Merge branch 'develop' into feature/create-room
|
2022-08-15 16:01:20 +03:00 |
|
mushka
|
d772e1eb13
|
removed not needed data
|
2022-08-15 15:58:03 +03:00 |
|
mushka
|
ec286077c2
|
updated and fixed SetRoomParams
|
2022-08-15 15:57:33 +03:00 |
|
mushka
|
e86d45d88d
|
removed unwanted file
|
2022-08-15 15:56:54 +03:00 |
|
TimofeyBoyko
|
13c36ac4f3
|
Web:Client:MainButton: add invite actions to main button for accounts page
|
2022-08-15 15:56:52 +03:00 |
|
mushka
|
f99806f51e
|
update of ThirdPartyStorage
|
2022-08-15 15:56:28 +03:00 |
|
mushka
|
a2f32969e4
|
updatedCreateRoomEvent
|
2022-08-15 15:55:37 +03:00 |
|
mushka
|
2c2ae838b3
|
updatedEditRoomEvent
|
2022-08-15 15:55:24 +03:00 |
|
mushka
|
2acc22b17f
|
added roomLogo methods to filesStore
|
2022-08-15 15:55:04 +03:00 |
|
mushka
|
95be5666fd
|
updated tagInput and tagList
|
2022-08-15 15:54:24 +03:00 |
|
mushka
|
aad25382f2
|
moved privacy setting to own component and added warning banner
|
2022-08-15 15:53:47 +03:00 |
|
mushka
|
d79e7bf452
|
fixed translations in data & removed thhirdparties
|
2022-08-15 15:53:16 +03:00 |
|
mushka
|
5aa2147bf3
|
added permanent settings
|
2022-08-15 15:52:30 +03:00 |
|
mushka
|
78fe429124
|
restructured params to templates
|
2022-08-15 15:52:10 +03:00 |
|
mushka
|
5097d09a44
|
created iconEditorComponent
|
2022-08-15 15:51:11 +03:00 |
|
mushka
|
84f50bd4bd
|
updated state in EditRoom
|
2022-08-15 15:50:31 +03:00 |
|
mushka
|
307be1d4e5
|
updated state in CreateRoom
|
2022-08-15 15:50:18 +03:00 |
|
mushka
|
a2ef8d46b5
|
updated and edited translations
|
2022-08-15 15:49:43 +03:00 |
|
mushka
|
868ca37341
|
added svg for icon-croppper grid
|
2022-08-15 15:49:19 +03:00 |
|
mushka
|
ea5b92f1af
|
added func for getting cloudTypeIcon to filesUtils
|
2022-08-15 15:48:23 +03:00 |
|
|
c729229e14
|
Web: Refactoring, added error handler when provider changed.
|
2022-08-15 14:27:24 +03:00 |
|
TimofeyBoyko
|
64d794d184
|
Web:Client:Acctouns: update filter data
|
2022-08-15 14:24:08 +03:00 |
|
TimofeyBoyko
|
4879908b88
|
Web:Client:Pages: move PeopleHome page to accounts folder
|
2022-08-15 13:51:32 +03:00 |
|
TimofeyBoyko
|
f2e67660ca
|
Web:Client:PeopleHome: fix active catalog item after reload page
|
2022-08-15 12:55:11 +03:00 |
|
TimofeyBoyko
|
818e3ff9ba
|
Web:Client:Article: delete useless code
|
2022-08-15 12:54:44 +03:00 |
|
|
769f70db18
|
Web: Files: fixed hotkeys scroll
|
2022-08-15 12:06:19 +03:00 |
|
TimofeyBoyko
|
3420660eba
|
Web:Client:Article: add isActive state for accounts item of catalog
|
2022-08-15 11:59:38 +03:00 |
|
|
d941020ef3
|
Web: Added updating folder list when changed provider.
|
2022-08-15 11:02:07 +03:00 |
|
TimofeyBoyko
|
4cd8e666ba
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-15 10:31:57 +03:00 |
|
|
af491f2a53
|
Web: Added new prop for connect dialog.
|
2022-08-15 10:20:28 +03:00 |
|
TimofeyBoyko
|
bf1d0b3b5c
|
Web:Client:ContextOptionsStore: return item as function argument to plugin callbacks
|
2022-08-15 09:54:36 +03:00 |
|
TimofeyBoyko
|
698a34198d
|
Web:Client:Plugin: fix deactivate method for plugin store
|
2022-08-15 09:53:46 +03:00 |
|
|
e3d82a9f7a
|
Web: Restore/ManualBackup: Refactoring, added file selection.
|
2022-08-14 16:11:07 +03:00 |
|
|
5fcb32c16e
|
Web: Files: fixed remove files
|
2022-08-12 17:35:30 +03:00 |
|
|
e5846be9ad
|
Web: Refactoring, fixed bugs after merge.
|
2022-08-12 17:32:22 +03:00 |
|
|
055102cdac
|
Web: Fixed bugs after merge.
|
2022-08-12 17:13:16 +03:00 |
|
|
a35aa2d306
|
Web: Files: fixed create folders
|
2022-08-12 15:56:18 +03:00 |
|
|
645c771b3b
|
Web: Components: fixed table columns
|
2022-08-12 15:28:57 +03:00 |
|
|
87d351a304
|
Web: Components: fixed List width, fixed fetch
|
2022-08-12 14:45:14 +03:00 |
|
|
856c1a1266
|
Web: SelectFolderInput: Returned imports.
|
2022-08-12 13:53:12 +03:00 |
|
|
6c2b49470c
|
WEb: Fixed after merge.
|
2022-08-12 13:25:29 +03:00 |
|
|
4feba8a356
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-12 13:08:12 +03:00 |
|
|
1853175976
|
Web: Files: fixed create/rename events
|
2022-08-12 12:56:57 +03:00 |
|
|
484d1867e6
|
Confirm: fix style
|
2022-08-11 17:43:39 +03:00 |
|
|
962ebd4e9c
|
Confirm: fix style
|
2022-08-11 17:16:20 +03:00 |
|
|
4463fc6e8f
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/sub-components/ButtonContainer.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectConnectionContainer.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectThirdPartyConnection.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/FormConnection.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/GetThirdPartyStoragesOptions.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/InputsMethods.js
# packages/common/components/Loaders/AutoBackupLoader/StyledAutoBackup.js
# packages/common/components/Loaders/AutoBackupLoader/index.js
# packages/common/components/Loaders/DataBackupLoader/StyledDataBackup.js
# packages/common/components/Loaders/DataBackupLoader/index.js
# packages/common/components/Loaders/RestoreBackupLoader/StyledRestoreBackup.js
# packages/common/components/Loaders/RestoreBackupLoader/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js
# products/ASC.Files/Server/GlobalUsings.cs
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/StyledBackup.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/AmazonSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/GoogleCloudSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/RackspaceSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/SelectelSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyStorageModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/AmazonStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/GoogleCloudStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/RackspaceStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/SelectelStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyResourcesModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyStoragesModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/AmazonStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/GoogleCloudStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/RackspaceStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/SelectelStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/BackupStore.js
|
2022-08-11 17:10:37 +03:00 |
|
|
c2f5295b52
|
Confirm: fix style
|
2022-08-11 16:49:05 +03:00 |
|
|
f4caa90745
|
Confirm: fix style
|
2022-08-11 16:36:17 +03:00 |
|
|
1f035e9556
|
Confirm: fix style
|
2022-08-11 16:30:11 +03:00 |
|
TimofeyBoyko
|
0353092791
|
Web:Client:Plugins: delete useless code
|
2022-08-11 16:18:36 +03:00 |
|
|
6a386f9be0
|
Confirm: fix style
|
2022-08-11 15:22:44 +03:00 |
|
|
18863258a0
|
Confirm: fix style
|
2022-08-11 14:53:43 +03:00 |
|
TimofeyBoyko
|
7e16507b41
|
Web:Client:Plugins: refactoring plugin store and helplers
|
2022-08-10 17:47:15 +03:00 |
|
TimofeyBoyko
|
10e20b9f17
|
Web:Helplers:Plugins: add plugin type for contstants
|
2022-08-10 16:26:33 +03:00 |
|
|
2aed8eb3a0
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
# packages/asc-web-components/index.js
# packages/client/src/DocspaceLogo/index.js
# packages/client/src/pages/Confirm/ConfirmWrapper.js
# packages/components/form-wrapper/index.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/StyledConfirm.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaActivation.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaAuth.js
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/StyledLogin.js
|
2022-08-10 16:16:43 +03:00 |
|
|
1c07363c48
|
SSO: fix edit
|
2022-08-10 15:30:41 +03:00 |
|
|
d0ea9b4d7e
|
SSO: fix clear data
|
2022-08-10 13:47:45 +03:00 |
|
|
8f4ee05948
|
Web: Files: fixed mobile scroll
|
2022-08-10 13:27:52 +03:00 |
|
|
966e1e293e
|
Web: Files: fixed hotkeys
|
2022-08-10 11:38:04 +03:00 |
|
|
2c2251d33e
|
Web: Files: added default useReactWindow prop
|
2022-08-10 11:37:14 +03:00 |
|
|
08c41f5121
|
Web: Files: FormGallery: removed useless code
|
2022-08-10 11:28:57 +03:00 |
|
|
2e06c8fd58
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
# Conflicts:
# build/install/win/DocSpace.aip
|
2022-08-10 09:57:03 +03:00 |
|
mushka
|
8f5f597c5f
|
Merge branch 'develop' into feature/create-room
|
2022-08-09 19:12:47 +03:00 |
|
|
abe3f73cb6
|
SSO: auto set checkboxes
|
2022-08-09 18:36:35 +03:00 |
|
|
75a7553397
|
SSO: fix delete
|
2022-08-09 18:28:57 +03:00 |
|
|
deffed2d14
|
Web: Files: fixed scroll for mobile devices
|
2022-08-09 16:19:52 +03:00 |
|
|
b1d70eaeb0
|
Web: Files: fixed Tile styles
|
2022-08-09 14:13:42 +03:00 |
|
|
0de5d36ce4
|
Web: Files: Scroll: added WindowScroller
|
2022-08-09 13:43:24 +03:00 |
|
TimofeyBoyko
|
012d347ca2
|
Web:Client: fix column width after switching from files to rooms
|
2022-08-09 10:57:30 +03:00 |
|
|
d0e4f67ec4
|
Merge branch 'develop' into feature/inifinite-scroll
# Conflicts:
# packages/client/src/components/Article/Body/index.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/InfiniteGrid.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/StyledInfiniteGrid.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# packages/client/src/store/FilesStore.js
|
2022-08-09 09:49:28 +03:00 |
|
TimofeyBoyko
|
4ec8ef90fe
|
Web:Helpers:Plugins: update
|
2022-08-08 19:53:58 +03:00 |
|
|
e6651821ce
|
SSO: fix exist certificate
|
2022-08-08 13:55:38 +03:00 |
|
|
b252732ed2
|
SSO: add translate
|
2022-08-08 13:55:23 +03:00 |
|
|
05ab23b63a
|
PortalSettings: fix after merge
|
2022-08-06 23:18:30 +03:00 |
|
|
28e0d02b28
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-06 23:12:39 +03:00 |
|
|
526b9ab82b
|
Web: Client: PortalSettings: Reworked preview page
|
2022-08-05 18:51:25 +03:00 |
|
|
72ea160e18
|
Web: Client: PortalSettings: Fixed portal integration page header
|
2022-08-05 18:50:39 +03:00 |
|
|
e972d28f87
|
SSO: fix
|
2022-08-05 18:10:45 +03:00 |
|
|
8c234ee0aa
|
SSO: fix forbidden image
|
2022-08-05 18:04:30 +03:00 |
|
|
08d8b4a580
|
Web: Client: Fixed isFrame as computed property
|
2022-08-05 17:26:30 +03:00 |
|
|
fce5867471
|
Web: Client: Fixed frameConfig property`s usage
|
2022-08-05 17:03:47 +03:00 |
|
|
be3fc664ca
|
Web: Integration: Fixed methods names: getItems -> getList, setItemsView -> setListView. Changed openCrateFileModal, openCrateFolderModal, openCrateRoomModal to openModal(type, options)
|
2022-08-05 15:02:49 +03:00 |
|
|
3babfa0f99
|
Client: PortalIntegration: Fixed message event binding
|
2022-08-05 13:47:54 +03:00 |
|
|
b1e65a25b0
|
SSO: wait tReady
|
2022-08-05 13:12:20 +03:00 |
|
|
b5f05f73d3
|
SSO: fix modal buttons
|
2022-08-05 13:03:35 +03:00 |
|
|
ecd1ca05d9
|
SSO: add loader, fix double error
|
2022-08-05 13:00:29 +03:00 |
|
|
3de884d0f9
|
Merge branch 'develop' into feature/integration-system
|
2022-08-05 11:12:32 +03:00 |
|
|
3ac5550727
|
SSO: fix style
|
2022-08-05 10:30:27 +03:00 |
|
|
0cdbaa4a83
|
SSO: fix style
|
2022-08-05 03:26:50 +03:00 |
|
|
e47e8ed4c1
|
SSO: fix padding
|
2022-08-05 03:07:41 +03:00 |
|
|
9101f90f18
|
SSO: fix modal style
|
2022-08-05 02:44:05 +03:00 |
|
|
a254ced4c3
|
SSO: fix table style
|
2022-08-05 01:43:23 +03:00 |
|
|
db75f31e28
|
SSO: add help btn
|
2022-08-05 01:43:07 +03:00 |
|
|
c09751c8a0
|
SSO: fix icon
|
2022-08-05 00:59:28 +03:00 |
|
|
746d5f3795
|
SSO: add copy link
|
2022-08-05 00:59:16 +03:00 |
|
|
fa9f50d1b7
|
Web: Fix many keys translation issues (prefix Home -> Files)
|
2022-08-04 18:35:32 +03:00 |
|
|
1230674026
|
Web: Fix 'ContainsSpecCharacter' key translation
|
2022-08-04 18:31:27 +03:00 |
|
|
33220f701b
|
Web: Fix 'NewRoom' key translation
|
2022-08-04 18:29:45 +03:00 |
|
|
9215ec53fc
|
Web: Fix 'EmptyFolderHeader' key translation
|
2022-08-04 18:27:41 +03:00 |
|
|
1b5ae746ac
|
Web: Fix 'FileRemoved' key translation
|
2022-08-04 18:26:17 +03:00 |
|
|
b28915462b
|
Web: Fix login and logout
|
2022-08-04 18:23:19 +03:00 |
|
|
7741d235f7
|
Web: Optimization of store
|
2022-08-04 17:34:53 +03:00 |
|
mushka
|
65e9cd6cac
|
separated createRoom and createRoomInThirdparty
|
2022-08-04 15:10:33 +03:00 |
|
|
b0039e6c4f
|
SSO: fix styles
|
2022-08-04 14:43:12 +03:00 |
|
|
cf0e9e05a1
|
SSO: fix translate
|
2022-08-04 14:42:59 +03:00 |
|
|
1926a9c4b3
|
Client: PortalSettings: Fixed integration api script path
|
2022-08-04 13:32:19 +03:00 |
|
|
87909ca9ed
|
Client: Home: Added base integration frame init after load client inside frame
|
2022-08-04 13:30:42 +03:00 |
|
mushka
|
d0182d7aad
|
created new IconEditorComponent
|
2022-08-04 13:28:54 +03:00 |
|
TimofeyBoyko
|
1fe0b51e1f
|
Web:Client:Section: add plugin items for main button to action list
|
2022-08-04 13:03:21 +03:00 |
|
|
c879c78dd5
|
SSO: fix set action
|
2022-08-04 12:52:00 +03:00 |
|
|
8767e532b7
|
SSO: fix style
|
2022-08-04 01:36:02 +03:00 |
|
TimofeyBoyko
|
634053e53f
|
Web:Client:Store: add items from plugins to context menu
|
2022-08-03 18:50:59 +03:00 |
|
TimofeyBoyko
|
b23e7fe914
|
Web:Client:ProfileActionsStore: add items from plugins to profile actions
|
2022-08-03 18:50:19 +03:00 |
|
TimofeyBoyko
|
c45ddd8c98
|
Web:Client:Article: add items from plugins to main button
|
2022-08-03 18:47:26 +03:00 |
|
TimofeyBoyko
|
ff8aa982d8
|
Web:Client:Shell: init plugin store
|
2022-08-03 18:46:47 +03:00 |
|
TimofeyBoyko
|
ceee18d4fe
|
Web:Helpers:Plugins: add constants, API for plugins, base methods and PluginStore
|
2022-08-03 18:46:18 +03:00 |
|
TimofeyBoyko
|
6445e83f24
|
Web:PortalSettings:PortalPlugins: add simple plugins list and upload button
|
2022-08-03 18:45:49 +03:00 |
|
mushka
|
24f26491d8
|
commented out help button in roomType
|
2022-08-03 16:41:00 +03:00 |
|
mushka
|
8fddde9d7c
|
fixed translation import
|
2022-08-03 16:37:45 +03:00 |
|
mushka
|
8c289c66ec
|
deleted unused console.log
|
2022-08-03 16:37:30 +03:00 |
|
mushka
|
28a95c269f
|
removed default tags interation from editRoom
|
2022-08-03 16:37:10 +03:00 |
|
mushka
|
050cd9fc84
|
fixed default tags names
|
2022-08-03 16:36:31 +03:00 |
|
mushka
|
4272c1f661
|
small stranslation fix
|
2022-08-03 16:34:14 +03:00 |
|
mushka
|
57e76d78e1
|
secondaryInfoButton fix position
|
2022-08-03 14:56:43 +03:00 |
|
mushka
|
b1b5b87871
|
implemented new translation keys
|
2022-08-03 14:56:26 +03:00 |
|
mushka
|
507979d9cc
|
added translation keys for storageLocation and MakePrivate secondary infos
|
2022-08-03 14:55:59 +03:00 |
|
|
ed67603126
|
Web: SSO: Fix setFields by api response config
|
2022-08-03 14:52:13 +03:00 |
|
|
4af1247136
|
Web: Integration: Restored after merge develop
|
2022-08-03 14:48:54 +03:00 |
|
mushka
|
50c6a82c8c
|
added translation keys for room types
|
2022-08-03 14:47:30 +03:00 |
|
mushka
|
766082b505
|
removed unused styles
|
2022-08-03 14:47:06 +03:00 |
|
mushka
|
29160a6cbc
|
impemented new SecondaryInfoButtonComponent
|
2022-08-03 14:46:55 +03:00 |
|
mushka
|
a373d0dcc8
|
created own component for help button
|
2022-08-03 14:42:49 +03:00 |
|
|
bf99da04bf
|
SSO: fix style
|
2022-08-02 18:22:34 +03:00 |
|
|
28698beeee
|
SSO: fix placeholders
|
2022-08-02 18:04:10 +03:00 |
|
|
bb49d50560
|
SSO: fix style
|
2022-08-02 17:46:50 +03:00 |
|
|
2ee692d007
|
SSO: fix validate error
|
2022-08-02 17:41:02 +03:00 |
|