|
b693779ea1
|
Merge branch 'develop' into feature/docspace-pin
|
2022-06-08 16:38:16 +03:00 |
|
|
848751220c
|
Files: added logos for rooms
|
2022-06-02 21:41:16 +03:00 |
|
|
a66c03aa86
|
Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
|
2022-05-24 23:13:57 +03:00 |
|
|
994bf92f06
|
Nlog: removed default settings.
Disabled Microsoft log except Microsoft.AspNetCore.Hosting.Diagnostics
|
2022-05-24 21:58:15 +03:00 |
|
|
75da995099
|
Merge branch 'develop' into feature/logger-refactoring
|
2022-05-20 17:01:51 +03:00 |
|
|
2e33540486
|
Merge branch 'feature/docspace' into feature/docspace-links
|
2022-05-17 11:53:37 +03:00 |
|
|
6c45bb0632
|
Merge branch 'develop' into feature/docspace
|
2022-05-17 11:50:56 +03:00 |
|
|
fbdef62782
|
fix audit
|
2022-05-15 23:19:11 +03:00 |
|
|
87a7a1089c
|
Merge branch 'develop' into feature/SSO-new
|
2022-05-12 19:37:24 +03:00 |
|
|
07909736c3
|
Merge branch 'develop' into feature/docspace
|
2022-04-29 16:49:18 +03:00 |
|
|
cf0e9c322d
|
ElasticSearch: fix
|
2022-04-29 16:17:52 +03:00 |
|
Vashchuk Nikita
|
442a6bb30a
|
Merge branch 'develop' into feature/SSO-new
# Conflicts:
# config/nginx/onlyoffice.conf
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Studio/Startup.cs
|
2022-04-28 15:45:11 +03:00 |
|
|
503672e6b2
|
Merge branch 'develop' into feature/docspace
|
2022-04-28 15:45:09 +03:00 |
|
|
b6fe254379
|
Files: docspace default enabled
|
2022-04-28 12:40:17 +03:00 |
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
Vashchuk Nikita
|
422e87af13
|
added ssoHandler
|
2022-04-25 21:41:26 +03:00 |
|
|
9eba173a44
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-04-21 22:36:29 +03:00 |
|
|
fd9dc93fe6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# config/kafka.json
|
2022-04-21 18:54:28 +03:00 |
|
|
95086e5d94
|
fix kafka settings
|
2022-04-21 14:06:32 +03:00 |
|
|
04fc13073f
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
|
2022-04-20 15:11:00 +03:00 |
|
|
7770cba4f6
|
Files: set default value for DocSpace
|
2022-04-20 11:26:52 +03:00 |
|
|
3380e87811
|
Files: oforms gallery manager
|
2022-04-20 10:34:33 +03:00 |
|
Timofey Boyko
|
5b3c46bce7
|
Fix kafka config
|
2022-04-12 12:15:43 +03:00 |
|
|
8292795d8c
|
Files: added root folders filter
|
2022-04-10 15:30:46 +03:00 |
|
|
6b8630f16f
|
Files: added docspace config parameter
|
2022-04-10 14:34:22 +03:00 |
|
|
406c07d8af
|
Config: Restored formatting
|
2022-04-06 21:25:10 +03:00 |
|
|
22181e08d7
|
Web: Files: Restore thumbnail-image cover and increased thumbnaillHeight and thumbnaillWidth for Info Panel
|
2022-04-06 21:08:08 +03:00 |
|
mushka
|
5a5237d927
|
fixed ad bar sizing with InfoPanel open & redesigned thumbnail scaling
|
2022-04-04 17:40:45 +03:00 |
|
mushka
|
fb2cb1316a
|
changed thumbnail styling
|
2022-04-01 17:39:03 +03:00 |
|
|
99cdaa0440
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-04-01 15:46:42 +03:00 |
|
|
07c45adaa9
|
socket: fix
|
2022-03-30 22:26:44 +03:00 |
|
|
700631836b
|
fix test config
|
2022-03-30 16:20:50 +03:00 |
|
|
f41c65623b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
# config/kafka.json
|
2022-03-30 11:14:47 +03:00 |
|
|
90623263e9
|
merge from feature/backend-refactor
|
2022-03-29 23:29:03 +03:00 |
|
|
75bd270037
|
Web: Files: Fix thumbnails: increased size and replaced 'resize' to real size
|
2022-03-29 22:03:11 +03:00 |
|
mushka
|
463a1f54a9
|
fix kafka conflict
|
2022-03-29 14:32:50 +03:00 |
|
|
7cca6cb98c
|
Web: revert kafka config
|
2022-03-28 17:22:42 +03:00 |
|
|
e7e0f5327a
|
Merge branch 'feature/backend-refactor' into feature/log-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
|
2022-03-28 14:29:36 +03:00 |
|
|
e5229f12f5
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/Configuration/StorageSettings.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# products/ASC.Files/Core/Core/ResponseStream.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2022-03-28 12:53:15 +03:00 |
|
|
1922da4ab9
|
merge
|
2022-03-24 20:56:51 +03:00 |
|
mushka
|
cd82919062
|
merge with feature/virtual-rooms-1.2
|
2022-03-24 18:00:31 +03:00 |
|
|
9174a20871
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# packages/asc-web-common/api/portal/index.js
# packages/asc-web-common/components/Loaders/index.js
# packages/asc-web-common/store/SettingsStore.js
# packages/asc-web-components/file-input/index.js
# packages/asc-web-components/modal-dialog/index.js
# packages/asc-web-components/save-cancel-buttons/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/store/ContextOptionsStore.js
# public/locales/de/Common.json
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/index.js
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
# web/ASC.Web.Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2022-03-24 14:39:52 +03:00 |
|
|
21f85e7260
|
logger refactoring. added resolver ILog/IOptionsMonitor<ILog>
|
2022-03-17 09:55:08 +03:00 |
|
mushka
|
384a92c30f
|
finished merging
|
2022-03-04 12:52:34 +03:00 |
|
mushka
|
bb69417dbf
|
fix kafka code formatting and ContextMenu - InfoPanel layering interaction
|
2022-03-03 16:23:45 +03:00 |
|
mushka
|
6b88a2dd43
|
change code formatting 2
|
2022-03-03 13:59:20 +03:00 |
|
mushka
|
424a7a7e3c
|
change code formatting
|
2022-03-03 13:43:43 +03:00 |
|
mushka
|
e77a97e105
|
added checkbox menu interaction and new opening mechanics
|
2022-03-02 17:19:19 +03:00 |
|
mushka
|
518abb7a2f
|
added sever files, fixed closeOnclick interaction, added alternative thumbnail and implemented destructorization
|
2022-02-28 15:53:46 +03:00 |
|