|
|
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 |
|
|
|
46caff0b0c
|
Push: post merge fixes
|
2022-08-15 01:00:11 +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 |
|
|
|
fa1258618a
|
fixed warnings
|
2022-08-12 17:49:34 +03:00 |
|
|
|
e5846be9ad
|
Web: Refactoring, fixed bugs after merge.
|
2022-08-12 17:32:22 +03:00 |
|
|
|
299bed5559
|
Merge pull request #758 from ONLYOFFICE/bugfix/editor-ssr-production-fix
Web: Editor: fixed duplication of global styles on each request (prod…
|
2022-08-12 17:27:17 +03:00 |
|
|
|
a04c6b3533
|
Merge branch 'develop' into bugfix/editor-ssr-production-fix
|
2022-08-12 17:25:49 +03:00 |
|
|
|
055102cdac
|
Web: Fixed bugs after merge.
|
2022-08-12 17:13:16 +03:00 |
|
|
|
0973f4e8d1
|
Files: removed .result
|
2022-08-12 16:26:57 +03:00 |
|
|
|
a941da35b4
|
removed ignored files
|
2022-08-12 16:11:25 +03:00 |
|
|
|
655cccb5c1
|
add "AddBaseDbContextPool"
|
2022-08-12 15:06:49 +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 |
|
|
|
670fa09923
|
Returned settings.
|
2022-08-12 13:50:34 +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 |
|
|
|
87ee619e09
|
Merge pull request #756 from ONLYOFFICE/feature/async-fix
Feature/async fix
|
2022-08-12 11:59:54 +03:00 |
|
Artem Tarasov
|
649a9d5ed5
|
Web: Editor: fixed duplication of global styles on each request (production)
|
2022-08-12 11:26:54 +03:00 |
|
|
|
296959b9ea
|
Merge pull request #757 from ONLYOFFICE/bugfix/editor-ssr-fix
Bugfix/editor ssr fix
|
2022-08-12 10:44:24 +03:00 |
|
Artem Tarasov
|
7673750d41
|
Web: Editor: fixed duplication of global styles on each request
|
2022-08-12 10:02:41 +03:00 |
|
|
|
23b059c0cc
|
fix
|
2022-08-11 22:35:53 +03:00 |
|
|
|
2314d6fc47
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-11 22:33:13 +03:00 |
|
|
|
5b613b8078
|
Files: async fix
|
2022-08-11 22:25:29 +03:00 |
|
|
|
7d32616524
|
Files: fix
|
2022-08-11 19:02:52 +03:00 |
|
TimofeyBoyko
|
06ce57f1bd
|
Plugins: add docspace-plugins and simple examples
|
2022-08-11 17:53:08 +03:00 |
|
TimofeyBoyko
|
bba15971de
|
Web: add new workspace 'plugins'
|
2022-08-11 17:51:45 +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 |
|
|
|
020fa7dcda
|
Merge branch 'develop' into feature/push
|
2022-08-11 17:15:37 +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 |
|
|
|
44bd9f1d6d
|
Files: fix
|
2022-08-11 16:55:35 +03:00 |
|
|
|
c2f5295b52
|
Confirm: fix style
|
2022-08-11 16:49:05 +03:00 |
|
|
|
2936cb4ca2
|
Files: fix
|
2022-08-11 16:44:08 +03:00 |
|
|
|
e54617c275
|
Files: fix
|
2022-08-11 16:37:18 +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 |
|
