|
|
eccca5ea5f
|
remove waste modules
|
2022-08-30 14:16:41 +03:00 |
|
|
|
d426b2f5d2
|
FederatedLogin: deleted unnecessary
|
2022-08-30 13:08:55 +03:00 |
|
|
|
15f5b67008
|
FederationLogin: refactor
|
2022-08-29 22:08:55 +03:00 |
|
|
|
3db342ffec
|
Merge branch 'develop' into feature/private-virtual-rooms
|
2022-08-29 17:39:57 +03:00 |
|
|
|
34969029a0
|
fixed warnings
|
2022-08-29 15:27:50 +03:00 |
|
|
|
ed5f62a877
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-26 18:48:20 +03:00 |
|
TimofeyBoyko
|
f92ffe10e5
|
Plugin: delete useless save
|
2022-08-26 17:13:22 +03:00 |
|
TimofeyBoyko
|
4c4fa75af9
|
Plugins: add validation for uploading file
|
2022-08-26 16:49:41 +03:00 |
|
TimofeyBoyko
|
30906a305f
|
Plugins: fix warnings
|
2022-08-26 14:05:13 +03:00 |
|
TimofeyBoyko
|
908349a111
|
Plugins: remfraf dist after start
|
2022-08-26 14:04:50 +03:00 |
|
TimofeyBoyko
|
3803163ff3
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-26 13:26:41 +03:00 |
|
TimofeyBoyko
|
bf170b594e
|
Plugins: delete useless code
|
2022-08-26 13:22:13 +03:00 |
|
TimofeyBoyko
|
0748afe854
|
Plugins: add logs, config and change service start
|
2022-08-26 12:51:43 +03:00 |
|
|
|
834a52707f
|
FederatedLogin: fix
|
2022-08-25 18:31:07 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
TimofeyBoyko
|
413f27a794
|
Plugins: import path to plugins from config file
|
2022-08-25 15:31:01 +03:00 |
|
|
|
0c596956f6
|
Merge branch 'develop' into feautre/private-virtual-rooms
|
2022-08-25 15:30:11 +03:00 |
|
TimofeyBoyko
|
07b9ffdcf7
|
Plugins: app new path to plugins store
|
2022-08-25 14:49:17 +03:00 |
|
TimofeyBoyko
|
bf87e9c4b1
|
Plugins: add error text for upload route
|
2022-08-25 14:03:19 +03:00 |
|
|
|
ff8e3c38e9
|
removed unnecessary
|
2022-08-25 13:54:11 +03:00 |
|
|
|
4dcd9be041
|
fix: removed IOptionsSnapshot
|
2022-08-25 13:29:08 +03:00 |
|
TimofeyBoyko
|
44ad3d4d90
|
Plugins: add validate by uniq file name
|
2022-08-25 12:17:05 +03:00 |
|
|
|
9b22d27306
|
Files: added keys check
|
2022-08-25 11:55:54 +03:00 |
|
TimofeyBoyko
|
f1d6d40123
|
Plugins: add file validate by mimetype
|
2022-08-25 11:54:10 +03:00 |
|
TimofeyBoyko
|
a4a0aa5d2b
|
Plugins: disable CORS
|
2022-08-25 10:53:14 +03:00 |
|
TimofeyBoyko
|
cb38d1ec60
|
Plugins: update response
|
2022-08-24 19:53:00 +03:00 |
|
TimofeyBoyko
|
a996f2ca9c
|
Plugins: add guard for check enable plugin-system from config
|
2022-08-24 19:13:32 +03:00 |
|
TimofeyBoyko
|
1192e149ad
|
Plugins: delete license from package.json files
|
2022-08-24 14:40:38 +03:00 |
|
TimofeyBoyko
|
ae34adc8e1
|
Plugins: Delete README.md
|
2022-08-24 14:38:13 +03:00 |
|
|
|
9523560b16
|
Push: fix api
|
2022-08-24 14:26:45 +03:00 |
|
|
|
ae49029f91
|
Push: fix api
|
2022-08-24 13:21:18 +03:00 |
|
TimofeyBoyko
|
ea113737d0
|
Common:ASC.WebPlugins: change port from 3000 to 5014
|
2022-08-24 12:36:12 +03:00 |
|
TimofeyBoyko
|
e755200787
|
Common:ASC.WebPlugins:SQL: rename table
|
2022-08-24 12:35:49 +03:00 |
|
|
|
ed41675476
|
Firebase: optimization
|
2022-08-24 12:34:30 +03:00 |
|
|
|
5967f4db97
|
Merge branch 'feature/push' of https://github.com/ONLYOFFICE/DocSpace into feature/push
|
2022-08-24 00:11:05 +03:00 |
|
|
|
d282aa74f7
|
Push: fixed message sending function
|
2022-08-24 00:10:37 +03:00 |
|
|
|
8f248f6ac2
|
Push: fix
|
2022-08-23 23:35:26 +03:00 |
|
|
|
632d7fbc41
|
Firebase: model
|
2022-08-23 20:03:02 +03:00 |
|
|
|
1ae7d3b11d
|
Api: push controller. Removed projects
|
2022-08-23 18:03:00 +03:00 |
|
TimofeyBoyko
|
355b6dd350
|
Common:ASC.WebPlugins: add yarn lock
|
2022-08-23 18:01:35 +03:00 |
|
TimofeyBoyko
|
7042dca053
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-23 14:38:45 +03:00 |
|
|
|
26d493f498
|
Push: fix
|
2022-08-23 14:28:42 +03:00 |
|
TimofeyBoyko
|
f86a533ea3
|
Add backend for web plugins
|
2022-08-23 14:22:49 +03:00 |
|
|
|
20dcd59616
|
Merge branch 'develop' into feature/push
|
2022-08-23 13:24:36 +03:00 |
|
|
|
971d4960c1
|
Push: fix
|
2022-08-23 13:23:00 +03:00 |
|
|
|
7f38657ce6
|
Push: global usings
|
2022-08-23 13:10:37 +03:00 |
|
|
|
c8e4ea7cec
|
Push: Newtonsoft.Json -> System.Text.Json
|
2022-08-23 12:05:09 +03:00 |
|
|
|
1c7d7fee77
|
Push: fix
|
2022-08-23 10:42:49 +03:00 |
|
|
|
b761071b7e
|
Merge branch 'develop' into feature/webhook-fix
|
2022-08-22 14:15:14 +03:00 |
|
|
|
4870031c1a
|
Api: webhooks retry
|
2022-08-22 14:00:57 +03:00 |
|
|
|
22213a25a7
|
Webhook: filter
|
2022-08-22 11:00:55 +03:00 |
|
|
|
9b5e966559
|
removed unused DisposableHttpContext
|
2022-08-19 13:56:32 +03:00 |
|
|
|
585a9f8d00
|
Webhooks: fix
|
2022-08-18 22:06:51 +03:00 |
|
|
|
5b8374daa0
|
refactoring
|
2022-08-18 19:00:22 +03:00 |
|
|
|
753284b312
|
Webhook: added name. renamed config_id
|
2022-08-18 16:41:53 +03:00 |
|
|
|
1bcd0c524c
|
Webhoks: added automapper
|
2022-08-18 12:34:48 +03:00 |
|
|
|
d26f045e8e
|
Webhooks: added enabled and delivery columns
|
2022-08-18 12:03:13 +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 |
|
|
|
88c3a92876
|
Backup: fixed mail
|
2022-08-17 12:38:51 +03:00 |
|
|
|
4cdce5b713
|
Webhook: async
|
2022-08-17 12:18:50 +03:00 |
|
|
|
6ec79e015e
|
Webhook: splited event in two columns
|
2022-08-16 17:47:40 +03:00 |
|
|
|
12760ef28f
|
Webhook: merged services. Added Polly.
|
2022-08-16 13:36:48 +03:00 |
|
|
|
c03a12209e
|
fixed total
|
2022-08-15 17:31:27 +03:00 |
|
|
|
92942fbcf6
|
People: fix
|
2022-08-15 14:30:50 +03:00 |
|
|
|
ce5009d0c6
|
Push: fixes
|
2022-08-15 14:27:54 +03:00 |
|
|
|
46caff0b0c
|
Push: post merge fixes
|
2022-08-15 01:00:11 +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 |
|
|
|
670fa09923
|
Returned settings.
|
2022-08-12 13:50:34 +03:00 |
|
|
|
6c2b49470c
|
WEb: Fixed after merge.
|
2022-08-12 13:25:29 +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 |
|
|
|
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 |
|
|
|
48d8e16d49
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-10 15:33:13 +03:00 |
|
|
|
97aee7f8c2
|
SSO: fix login
|
2022-08-10 15:33:02 +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 |
|
|
|
ea2f03331b
|
refactoring
|
2022-08-09 19:13:07 +03:00 |
|
|
|
bfe43ebe96
|
SSO: fix login
|
2022-08-09 16:53:22 +03:00 |
|
|
|
baaec9dcef
|
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-09 16:27:35 +03:00 |
|
|
|
6db28a8a86
|
warm up service: added logs
|
2022-08-09 12:51:32 +03:00 |
|
|
|
5f69b6bc0c
|
warm up services
|
2022-08-09 10:28:44 +03:00 |
|
|
|
f496771391
|
warm up services
|
2022-08-09 09:49:05 +03:00 |
|
|
|
562eb6144d
|
SSO: fix login
|
2022-08-09 01:26:27 +03:00 |
|
|
|
870c3cf3c4
|
warm up services
|
2022-08-08 19:25:22 +03:00 |
|
|
|
9ce72036ec
|
fix
|
2022-08-08 18:32:46 +03:00 |
|
|
|
d26eee0424
|
Async: fix webhook
|
2022-08-05 18:47:33 +03:00 |
|
|
|
59160afcdc
|
SSO: fix template path
|
2022-08-05 17:29:17 +03:00 |
|
|
|
92fa19ec82
|
Webhook: fix iasyncenumerable
|
2022-08-04 18:59:21 +03:00 |
|
|
|
26b79aa67b
|
Added install-state.gz to .gitignore
|
2022-08-03 17:22:10 +03:00 |
|
|
|
bb80d28945
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
|
2022-08-02 17:03:50 +03:00 |
|
|
|
9d3bc076b9
|
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
|
2022-08-02 11:59:47 +03:00 |
|
|
|
a4ea50c760
|
split AuditReportCreator
|
2022-08-01 17:23:50 +03:00 |
|
|
|
7000cd55f6
|
Merge branch 'develop' into refactoring/client
|
2022-08-01 15:59:18 +03:00 |
|
|
|
07e8e49579
|
Web: Fix Frontend.Translations.Tests run
|
2022-08-01 15:55:39 +03:00 |
|
|
|
58d3407729
|
fix
|
2022-08-01 13:58:14 +03:00 |
|
|
|
ceae4ff07d
|
packages updated
|
2022-08-01 13:58:12 +03:00 |
|
|
|
3c3234b6c2
|
Merge branch 'develop' into feature/fix-api
|
2022-08-01 13:51:05 +03:00 |
|
|
|
4559942c30
|
fix confrim links
|
2022-08-01 13:50:31 +03:00 |
|
