|
|
16c7d80398
|
Files: fix root files
|
2022-08-29 11:57:48 +03:00 |
|
|
|
a8972c7cba
|
Files: fix rooms sorting
|
2022-08-29 10:47:54 +03:00 |
|
|
|
d11e228792
|
Merge branch 'develop' into bugfix/sharpbox
|
2022-08-29 10:27:50 +03:00 |
|
|
|
4797576a0c
|
Files: fix open in editor
|
2022-08-26 13:54:22 +03:00 |
|
|
|
b4a5fb253f
|
Files: fix rename for SharpBox, SharePoint providers
|
2022-08-26 13:08:03 +03:00 |
|
|
|
1be967fe3f
|
Files: added id conversion in base64 string
|
2022-08-26 13:07:27 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
|
|
4dcd9be041
|
fix: removed IOptionsSnapshot
|
2022-08-25 13:29:08 +03:00 |
|
|
|
1b158e1e5e
|
Merge branch 'develop' into feature/push
|
2022-08-25 11:22:07 +03:00 |
|
|
|
6ee5cdb0c3
|
Merge branch 'develop' into feature/room-filter
|
2022-08-25 10:23:24 +03:00 |
|
|
|
e2472b392e
|
Files: fix doceditor link
|
2022-08-24 20:27:20 +03:00 |
|
|
|
00e580438f
|
Files: fix rename room
|
2022-08-24 16:13:20 +03:00 |
|
|
|
3d706635f5
|
Files: fix rename room
|
2022-08-24 16:09:43 +03:00 |
|
|
|
0e9099017a
|
Merge branch 'develop' into bugfix/room-logo
|
2022-08-23 18:05:14 +03:00 |
|
|
|
58b48df3ab
|
Files: added folders only filter for rooms
|
2022-08-23 17:22:50 +03:00 |
|
|
|
b633dcb4e6
|
update DocStore
|
2022-08-23 17:19:21 +03:00 |
|
|
|
718d87c7d6
|
Files: forms. remove caching
|
2022-08-23 17:16:15 +03:00 |
|
|
|
34232bc735
|
Files: removed oformservice
|
2022-08-23 16:34:54 +03:00 |
|
|
|
e7fa60d13c
|
Merge branch 'develop' into feature/push
|
2022-08-23 15:32:06 +03:00 |
|
|
|
53ee8e9e15
|
Files: fix security
|
2022-08-23 15:18:37 +03:00 |
|
|
|
4c923b5117
|
Files: fix access
|
2022-08-23 14:54:51 +03:00 |
|
|
|
20dcd59616
|
Merge branch 'develop' into feature/push
|
2022-08-23 13:24:36 +03:00 |
|
|
|
5375ad19c5
|
Files: fix logo for SharePoint
|
2022-08-23 13:20:26 +03:00 |
|
|
|
95fa372f8a
|
Files: fix update path for SharePoint
|
2022-08-23 13:15:24 +03:00 |
|
|
|
f649ee0292
|
Files: fix room logo
|
2022-08-23 13:07:30 +03:00 |
|
|
|
7c579fbd28
|
Files: fix thirdparty room deletion
|
2022-08-23 12:08:26 +03:00 |
|
|
|
a7ce34d4ce
|
Files: fix for SharpBox
|
2022-08-23 11:37:18 +03:00 |
|
|
|
670fd4952a
|
Files: fix security priority
|
2022-08-23 10:54:55 +03:00 |
|
|
|
0be56bdc15
|
Files: refactor
|
2022-08-22 18:57:10 +03:00 |
|
|
|
b36abf5c0c
|
Files: fix renaming thirdparty room
|
2022-08-22 18:57:03 +03:00 |
|
|
|
61d8ed822a
|
Files: fix path updating
|
2022-08-22 18:56:27 +03:00 |
|
|
|
dd2ec8082c
|
Files: fix renaming thirdparty room
|
2022-08-22 18:55:03 +03:00 |
|
|
|
099e7058a7
|
Files: fix thirdparty id mapping
|
2022-08-22 11:06:16 +03:00 |
|
|
|
d4eefc6145
|
Files: fixed optional params
|
2022-08-19 15:47:11 +03:00 |
|
|
|
8b6821d410
|
Files: fixed .format folders methods
|
2022-08-19 14:57:51 +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 |
|
|
|
92942fbcf6
|
People: fix
|
2022-08-15 14:30:50 +03:00 |
|
|
|
ce5009d0c6
|
Push: fixes
|
2022-08-15 14:27:54 +03:00 |
|
|
|
0973f4e8d1
|
Files: removed .result
|
2022-08-12 16:26:57 +03:00 |
|
|
|
6c2b49470c
|
WEb: Fixed after merge.
|
2022-08-12 13:25:29 +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 |
|
|
|
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 |
|
|
|
2936cb4ca2
|
Files: fix
|
2022-08-11 16:44:08 +03:00 |
|
|
|
e54617c275
|
Files: fix
|
2022-08-11 16:37:18 +03:00 |
|
|
|
c3252df9ec
|
Web: Added prop type.
|
2022-08-11 15:55:46 +03:00 |
|
|
|
c39451a531
|
Web: Added room selection.
|
2022-08-11 15:54:12 +03:00 |
|
