mushka
|
d11bf57154
|
setParamsBugfix
|
2022-08-23 18:44:20 +03:00 |
|
mushka
|
89b712d09e
|
changed uploadedFile from icon.big to icon.original
|
2022-08-23 14:56:10 +03:00 |
|
mushka
|
e0027510d5
|
coded out functionalitu for adding logos to rooms in createRoomEvent
|
2022-08-23 14:43:21 +03:00 |
|
TimofeyBoyko
|
7042dca053
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-23 14:38:45 +03:00 |
|
mushka
|
07dd6b04cb
|
added an ability for FileTile to display room logo
|
2022-08-23 14:38:37 +03:00 |
|
mushka
|
43e1562f3d
|
added functionality for uploading and deleting roomLogos in EditRoomEvent
|
2022-08-23 14:36:35 +03:00 |
|
TimofeyBoyko
|
5dc51e2c32
|
Web:Client:PortalPlugins: add translation keys
|
2022-08-23 14:35:51 +03:00 |
|
mushka
|
9f7fb72519
|
removed uselsess functions from thirdpartyStorage
|
2022-08-23 14:34:37 +03:00 |
|
mushka
|
02db59a9d4
|
removed useless uploadedFile var from IconEditor
|
2022-08-23 14:33:19 +03:00 |
|
mushka
|
097072919f
|
commented out logo fetching functionality in EditroomDialog
|
2022-08-23 14:31:21 +03:00 |
|
mushka
|
9dcc3af710
|
added thirdpartyfolderId param to roomParams in createRoomDialog
|
2022-08-23 14:30:46 +03:00 |
|
mushka
|
23a5faa0a4
|
cleaned up api/rooms
|
2022-08-23 14:30:16 +03:00 |
|
mushka
|
afc24f98cc
|
added removeLogo api call to api/rooms
|
2022-08-23 14:29:47 +03:00 |
|
mushka
|
28296d2095
|
added logo as a file param to filesStore
|
2022-08-23 14:28:22 +03:00 |
|
TimofeyBoyko
|
0ae23204f7
|
Web:Client:PortalPlugins: add delete method
|
2022-08-23 14:11:23 +03:00 |
|
|
|
1ab4ff0a08
|
Web: Added waiting for translations.
|
2022-08-22 16:56:59 +03:00 |
|
mushka
|
abee52081b
|
filter out unavialable connect items
|
2022-08-22 16:30:35 +03:00 |
|
mushka
|
bc426aa1d2
|
fixed bug with unsupported connectItems
|
2022-08-22 16:29:45 +03:00 |
|
mushka
|
c38ef492b1
|
commented out thirdparty param
|
2022-08-22 16:20:48 +03:00 |
|
mushka
|
dacc26a811
|
updated and added props to pass to editRoomEvent
|
2022-08-22 16:19:11 +03:00 |
|
mushka
|
c0f615b81b
|
added functiopnality to 3party combob box, integrated conect dialog
|
2022-08-22 16:18:40 +03:00 |
|
|
|
3618f58c25
|
Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup
|
2022-08-22 16:18:37 +03:00 |
|
mushka
|
1e6adaf1f8
|
updated perm settings styling
|
2022-08-22 16:18:11 +03:00 |
|
mushka
|
02ff3d68c7
|
created folder input for thirdpartyy connection
|
2022-08-22 16:17:58 +03:00 |
|
mushka
|
c01db749b9
|
fixed permanent settings
|
2022-08-22 16:17:39 +03:00 |
|
mushka
|
5991b944be
|
fixed dropdzome styling
|
2022-08-22 16:17:07 +03:00 |
|
mushka
|
8d14df2314
|
new entities in dialogStore and several new props to pass for thirdparty connection
|
2022-08-22 16:16:50 +03:00 |
|
|
|
52a008ca61
|
Web: Fixed translations,icons.
|
2022-08-22 16:16:49 +03:00 |
|
mushka
|
c5a78fafd3
|
updated connect diaolog to work with room creation
|
2022-08-22 16:15:28 +03:00 |
|
|
|
5a399caf0e
|
Web: The click area of the context menu has been enlarged.
|
2022-08-22 16:04:57 +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
|
6e083782d7
|
updated and fixed modal-dialog
|
2022-08-19 04:10:12 +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 |
|
|
|
8fefd3debb
|
Merge branch 'develop' into feature/create-room
|
2022-08-18 11:25:02 +03:00 |
|
|
|
2b6c4b127a
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Server/Api/ThirdpartyController.cs
|
2022-08-17 13:58:00 +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 |
|
|
|
b65b7c75e5
|
Move translates from NavMenu to Login
|
2022-08-16 16:26:00 +03:00 |
|
|
|
36c52959e5
|
delete useless
|
2022-08-16 16:13:50 +03:00 |
|
|
|
a9591c875c
|
Login: add recover access dialog
|
2022-08-16 12:51:28 +03:00 |
|
|
|
6ef8662ab3
|
Login: RecoverAccess: add logic
|
2022-08-16 12:50:35 +03:00 |
|
|
|
acd6ed8b57
|
Login: move recover access modal from client
|
2022-08-16 12:33:45 +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 |
|
|
|
e08d1342c2
|
Login: fix style
|
2022-08-16 12:06:32 +03:00 |
|
|
|
34453e8cea
|
Login: fix style
|
2022-08-16 11:47:54 +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 |
|
|
|
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 |
|
|
|
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
|
6b69ef62ea
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-15 15:59:04 +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 |
|
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
|
f0351ceec0
|
added roomLogo api methods
|
2022-08-15 15:54:46 +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 |
|
|
|
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 |
|
|
|
c79d5e5885
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-12 18:17:31 +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 |
|
|
|
c72a9b18e0
|
Login: comment signin with code
|
2022-08-12 14:40:25 +03:00 |
|
|
|
856c1a1266
|
Web: SelectFolderInput: Returned imports.
|
2022-08-12 13:53:12 +03:00 |
|
|
|
191f527028
|
Login: RoomsLogin: fix
|
2022-08-12 13:48:30 +03:00 |
|
|
|
d32cadc5e3
|
Login: RoomsLogin: add background pattern
|
2022-08-12 13:36:08 +03:00 |
|
|
|
938b34bcdc
|
Login: redesign
|
2022-08-12 13:33:38 +03:00 |
|
|
|
4638c8dca5
|
Login: add translates
|
2022-08-12 13:33:20 +03:00 |
|
|
|
f60aaef514
|
Login: CodeLogin: add logo
|
2022-08-12 13:32:58 +03:00 |
|
|
|
6c2b49470c
|
WEb: Fixed after merge.
|
2022-08-12 13:25:29 +03:00 |
|
|
|
ba66b55d4d
|
Login: fix register height
|
2022-08-12 13:07:42 +03:00 |
|
|
|
3bbd457505
|
Merge branch 'develop' into feature/login-confirm-redesign
|
2022-08-12 12:05:40 +03:00 |
|
Artem Tarasov
|
649a9d5ed5
|
Web: Editor: fixed duplication of global styles on each request (production)
|
2022-08-12 11:26:54 +03:00 |
|
Artem Tarasov
|
7673750d41
|
Web: Editor: fixed duplication of global styles on each request
|
2022-08-12 10:02:41 +03:00 |
|
|
|
484d1867e6
|
Confirm: fix style
|
2022-08-11 17:43:39 +03:00 |
|
|
|
eea2c0c656
|
Components: FormWrapper: fix min-width
|
2022-08-11 17:43:30 +03:00 |
|
|
|
6316de2937
|
Components: FormWrapper: fix width
|
2022-08-11 17:17:21 +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 |
|
TimofeyBoyko
|
ecf3da4668
|
Web:Components:DropDownItem: add available display icon as link
|
2022-08-11 16:14:14 +03:00 |
|
|
|
c39451a531
|
Web: Added room selection.
|
2022-08-11 15:54:12 +03:00 |
|
|
|
6a386f9be0
|
Confirm: fix style
|
2022-08-11 15:22:44 +03:00 |
|
|
|
8c3bc03f6d
|
Components: FormWrapper: fix width
|
2022-08-11 15:22:30 +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 |
|
TimofeyBoyko
|
d6f1f99d02
|
Web:Components:ContextMenu: add available show item icon from relative path
|
2022-08-10 16:21:00 +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 |
|
|
|
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 |
|
mushka
|
67cedcd06e
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-09 19:08:11 +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 |
|
TimofeyBoyko
|
c680c90580
|
Web:Components:add support dark-theme for tag component
|
2022-08-09 11:15:01 +03:00 |
|
TimofeyBoyko
|
012d347ca2
|
Web:Client: fix column width after switching from files to rooms
|
2022-08-09 10:57:30 +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 |
|
