Commit Graph

534 Commits

Author SHA1 Message Date
888744a586 rabbitmq: extended config 2022-09-08 14:20:01 +03:00
646063868f nginx: replaced localhost with 127.0.0.1, because sometimes localhost resolved nginx as ipv6 2022-09-07 19:18:43 +03:00
46d0b89433
Merge pull request #788 from ONLYOFFICE/feature/rooms-feed
Feature/rooms feed
2022-09-06 14:46:49 +04:00
75206fe16a Config: Restored some languages for Payment System 2022-09-06 10:54:19 +03:00
fa1703be2d config: added missed row after merge. 2022-09-05 10:33:07 +03:00
a26426f925 nginx: added feed 2022-09-02 13:42:09 +03:00
b811d2bb14 Web: Removed useless for static build 2022-09-02 11:31:35 +03:00
Artem Tarasov
0621fd9c86 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/dialogs/ConnectDialog/index.js
#	packages/login/src/Login.jsx
#	packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	yarn.lock
2022-08-30 18:38:12 +03:00
9154b971c0 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/api/settings/index.js
#	packages/common/components/Loaders/index.js
2022-08-29 13:06:44 +03:00
Vlada Gazizova
302e2e655a
Merge branch 'develop' into feature/settings-common 2022-08-27 12:17:44 +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
3803163ff3 Merge branch 'develop' into feature/system-plugin-v2 2022-08-26 13:26:41 +03:00
TimofeyBoyko
0748afe854 Plugins: add logs, config and change service start 2022-08-26 12:51:43 +03:00
641695ec51 Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
TimofeyBoyko
1590e9e3d2 Config: add config with path to plugins 2022-08-25 15:30:31 +03:00
TimofeyBoyko
b6f85bd58c Config:Nginx: add static/plugins location 2022-08-25 14:50:31 +03:00
1b158e1e5e Merge branch 'develop' into feature/push 2022-08-25 11:22:07 +03:00
TimofeyBoyko
69edfeb8ab Merge branch 'develop' into feature/system-plugin-v2 2022-08-24 12:42:33 +03:00
TimofeyBoyko
90efddb088 Add routes for plugin-system at nginx config 2022-08-24 12:37:33 +03:00
Artem Tarasov
6f9120ee03 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/store/TargetUserStore.js
#	packages/common/store/AuthStore.js
#	packages/common/store/SettingsStore.js
#	packages/common/utils/index.ts
#	packages/login/src/Login.jsx
#	packages/login/src/RoomsLogin.jsx
2022-08-24 10:17:39 +03:00
0e9099017a
Merge branch 'develop' into bugfix/room-logo 2022-08-23 18:05:14 +03:00
32e3ec6af2 Settings: Added plugins config 2022-08-23 17:51:06 +03:00
34232bc735 Files: removed oformservice 2022-08-23 16:34:54 +03:00
734670404e Files: fix access 2022-08-23 14:55:03 +03:00
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
d75edd14d6 Merge branch 'develop' into feature/settings-common
# Conflicts:
#	config/appsettings.json
2022-08-22 15:07:55 +03:00
2e85702127 Settings: version. CommunityServer replaced with DocSpace 2022-08-19 16:34:39 +03:00
36c30428fc Merge branch 'develop' into feature/settings-common 2022-08-19 15:05:33 +03:00
5b8374daa0 refactoring 2022-08-18 19:00:22 +03:00
b82a4206e0 Merge branch 'develop' into feature/settings-common 2022-08-12 18:04:11 +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
Artem Tarasov
7d1939f76d Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/login/src/server/lib/template.ts
#	packages/login/tsconfig.json
#	packages/login/webpack/webpack.base.js
#	packages/login/webpack/webpack.client.js
#	packages/login/webpack/webpack.server.js
#	web/ASC.Web.Login/package.json
#	yarn.lock
2022-08-02 10:41:10 +03:00
1f17ab9231 Nginx: Restored files handlers 2022-08-01 17:53:57 +03:00
a14c0f74d5 Nginx: Removed old files/people configs 2022-08-01 16:55:44 +03:00
e9312097cc Nginx: Renamed onlyoffice-studio.conf to onlyoffice-client.conf 2022-08-01 16:55:11 +03:00
d093c97b97 Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
995d07deae Web: Upgrade yarn to v3.2.2 2022-07-29 18:20:57 +03:00
6fd385e026 Merge branch 'develop' into feature/docspace-backup 2022-07-29 11:13:42 +03:00
09f3b29fe9 backup s3 2022-07-25 16:13:36 +03:00
c956d8b696 Web: Merged 'Files' module with 'Client' and fixed paths 2022-07-24 19:57:03 +03:00
12e7d4edbf Merge branch 'develop' into feature/settings-common 2022-07-22 13:22:59 +03:00
Artem Tarasov
1549bbd7fd Web: nginx: added rules for login-ssr 2022-07-22 12:03:16 +03:00
aa0c8fa14b Web:Added "themelimit": "10". 2022-07-22 11:10:09 +03:00
Artem Tarasov
345dad709c Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 16:02:48 +03:00
b4cd5ffa0c
Merge branch 'develop' into feature/appserver-develop-docker-build 2022-07-21 15:05:34 +03:00
Artem Tarasov
0b0a72b43f Web: Doceditor: fixed production config for products/files/doceditor 2022-07-21 12:42:47 +03:00
Artem Tarasov
55198d0e7f Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/src/i18n.js
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-10 11:23:44 +03:00
7af929fee8 Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-07-07 17:41:41 +03:00
fbb9120a2d Web: revert config 2022-07-05 23:37:56 +03:00
95ce082219 Web: Components: Added DropDown offsetLeft default value 2022-07-05 22:56:18 +03:00
sk81.biz@gmail.com
4e82c38cb5 Cosmetic modify 2022-07-05 18:09:51 +03:00
sk81.biz@gmail.com
0707f90772 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into feature/appserver-develop-docker-build 2022-07-05 14:20:45 +03:00
Sergey Kirichenko
1fade93e95 Fix ssoath.json format file 2022-07-05 10:17:46 +03:00
Artem Tarasov
2ef94f75da Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-01 23:41:10 +03:00
7e34e45371 ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
74d238bde8 Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Common/Logging/Log.cs
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Backup.Core/BackupResource.Designer.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
#	products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
#	products/ASC.Files/Core/Core/Compress/CompressToZip.cs
#	products/ASC.Files/Core/Core/Compress/ICompress.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
2022-06-30 16:13:31 +03:00
6b2f643441 Fix Bug 57852: add flags for languages combo 2022-06-30 11:25:20 +03:00
594babd0f1
Merge pull request #700 from ONLYOFFICE/feature/fix-sso
fixed sso path
2022-06-24 18:45:45 +03:00
27694eb157 fixed sso path 2022-06-24 10:32:04 +03:00
f2da6fc55c
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
2022-06-22 11:55:36 +04:00
b78feb8ae9 refactoring 2022-06-21 12:57:20 +03:00
50fe9e7b37 fixed sso path 2022-06-20 12:17:11 +03:00
e68ac70005 Merge branch 'develop' into feature/docspace 2022-06-20 12:15:08 +03:00
9f45f8994b fix config 2022-06-20 11:31:32 +03:00
e2cee2c2fc Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.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/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
945e9d8efe moved from ddf515b8 2022-06-17 18:46:16 +03:00
56ece27e1b moved from ddf515b8 2022-06-16 17:16:46 +03:00
3e133836c6 Fix Bug 57535 - Client.OformsGallery. 404 error on not 'en' language 2022-06-16 15:43:46 +03:00
1e47bf9bf3 Push: configuration 2022-06-15 17:25:23 +03:00
f3f3ed96ae moved from ddf515b8 2022-06-15 12:46:21 +03:00
02635e0e2e fix bug 57535 2022-06-14 11:33:12 +03:00
Artem Tarasov
2eebeb3c1a Merge branch 'develop' into feature/doceditor-ssr 2022-06-14 11:22:23 +03:00
b693779ea1 Merge branch 'develop' into feature/docspace-pin 2022-06-08 16:38:16 +03:00
832a341306 fix Bug 57478 2022-06-08 13:48:28 +03:00
8c56de7a26 moved from ddf515b8 2022-06-05 18:44:37 +03:00
848751220c Files: added logos for rooms 2022-06-02 21:41:16 +03:00
e2b4b30e2f Config: Added routes for new images 2022-05-27 14:57:19 +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
f2ede4c62c Web: Files: Applied changes of new thumbnail sizes 2022-05-19 15:19:51 +03:00
9886081a2e Thumbnailы: added sizes config 2022-05-18 17:23:17 +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
ca3a49c25b fix 56849 2022-05-05 17:07:24 +03:00
fc7f066af6 config: Turned on new languages az,cs,el,es,ja,lo,nl,pt,ro,sk,tr,vi,bg,fi,ko,lv,pl,sl,uk,zh-CN 2022-05-05 16:47:34 +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
Artem Tarasov
38e06018e5 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	packages/asc-web-common/api/client.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.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/Home/index.js
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Editor/src/StyledEditor.js
#	yarn.lock
2022-04-28 14:12:06 +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