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
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
Artem Tarasov
1195dc74ca
Merge branch 'develop' into feature/doceditor-ssr
...
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
2022-03-29 17:53:01 +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
Artem Tarasov
a2ca0f1a7d
Merge branch 'develop' into feature/doceditor-ssr
2022-03-21 12:23:44 +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
f07aa0a183
Merge branch 'develop' into feature/backup
...
# Conflicts:
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# config/nginx/onlyoffice.conf
# packages/asc-web-common/constants/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2022-02-25 16:05:43 +03:00
7e67e9a41c
merge from develop
2022-02-24 17:33:02 +03:00
7f70d0be04
Merge branch 'feature/backend-refactor' into feature/winsw
2022-02-24 14:50:18 +03:00
a3ba7e2ecc
bugfix and refactoring urlShortener
2022-02-24 14:45:52 +03:00
ffaea6ae2c
nginx: Remove old products locations
2022-02-22 18:24:54 +03:00
d157dd637e
Build: Removed old products nginx configs
2022-02-22 18:23:56 +03:00
Artem Tarasov
73a0c6b637
Merge branch 'develop' into feature/doceditor-ssr
...
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Editor/src/App.js
# yarn.lock
2022-02-22 13:00:33 +03:00
Artem Tarasov
484270d00c
Web: Config: deleted nginx config for editor
2022-02-22 12:49:00 +03:00
6b1aed3042
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2022-02-21 22:27:50 +03:00
3aeac42444
Merge branch 'master' into develop
...
# Conflicts:
# common/ASC.Core.Common/Data/DbSubscriptionService.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
# common/services/ASC.ElasticSearch/Service/Settings.cs
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
# common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# packages/asc-web-components/table-container/TableRow.js
# products/ASC.Files/Client/public/locales/az/Home.json
# products/ASC.Files/Client/public/locales/bg/Home.json
# products/ASC.Files/Client/public/locales/bg/Translations.json
# products/ASC.Files/Client/public/locales/cs/Home.json
# products/ASC.Files/Client/public/locales/de/ConvertDialog.json
# products/ASC.Files/Client/public/locales/de/Home.json
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/de/UploadPanel.json
# products/ASC.Files/Client/public/locales/el/ConvertDialog.json
# products/ASC.Files/Client/public/locales/el/Home.json
# products/ASC.Files/Client/public/locales/en/ConvertDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/en/UploadPanel.json
# products/ASC.Files/Client/public/locales/es/ConvertDialog.json
# products/ASC.Files/Client/public/locales/es/Home.json
# products/ASC.Files/Client/public/locales/es/UploadPanel.json
# products/ASC.Files/Client/public/locales/fi/Home.json
# products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
# products/ASC.Files/Client/public/locales/fr/Home.json
# products/ASC.Files/Client/public/locales/fr/Translations.json
# products/ASC.Files/Client/public/locales/it/ConvertDialog.json
# products/ASC.Files/Client/public/locales/it/Home.json
# products/ASC.Files/Client/public/locales/it/Translations.json
# products/ASC.Files/Client/public/locales/it/UploadPanel.json
# products/ASC.Files/Client/public/locales/ja/Home.json
# products/ASC.Files/Client/public/locales/ja/UploadPanel.json
# products/ASC.Files/Client/public/locales/lv/Home.json
# products/ASC.Files/Client/public/locales/nl/Home.json
# products/ASC.Files/Client/public/locales/nl/Translations.json
# products/ASC.Files/Client/public/locales/pl/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
# products/ASC.Files/Client/public/locales/pt-BR/Home.json
# products/ASC.Files/Client/public/locales/pt-BR/Translations.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/UploadPanel.json
# products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/public/locales/ru/UploadPanel.json
# products/ASC.Files/Client/public/locales/sk/Home.json
# products/ASC.Files/Client/public/locales/tr/Home.json
# products/ASC.Files/Client/public/locales/uk/Home.json
# products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
# products/ASC.Files/Client/public/locales/vi/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/Home.json
# products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
# products/ASC.Files/Client/src/HOCs/withBadges.js
# products/ASC.Files/Client/src/HOCs/withContent.js
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
# public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
mushka
f2ba9680c2
fix kafka
2022-02-15 15:01:23 +03:00
mushka
125796a112
body content
2022-02-15 14:57:36 +03:00
Sergey Kirichenko
6e20d619d1
Mod socket proxy conf
2022-02-14 18:41:15 +03:00
c62d42de80
Socket.IO: Move pingInterval and reconnectAttempts to config
2022-02-09 12:11:39 +03:00
5d0bcdbbfb
Config: Added redisHost, redisPort
2022-02-08 17:20:13 +03:00
Artem Tarasov
51e8212eb9
Web: DocEditor/nginx: added base path for doceditor
2022-02-08 01:48:41 +03:00
40d56075f1
Merge branch 'develop' into feature/backup
...
# Conflicts:
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# common/services/ASC.Data.Backup/Startup.cs
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# products/ASC.Files/Client/public/locales/en/OperationsPanel.json
# products/ASC.Files/Client/public/locales/en/Settings.json
# products/ASC.Files/Client/public/locales/ru/Settings.json
# products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/webpack.config.js
2022-02-07 12:40:50 +03:00
f3b3b08af1
add support rabbitmq. split ASC.Data.Backup service on two services
2022-02-04 20:44:03 +03:00
a2cc00b521
fix test config (dotnet issue)
2022-02-04 18:40:55 +03:00
Artem Tarasov
7d4971972a
Web: nginx: added X-REWRITER-URL header for /files/doceditor
2022-02-04 17:02:12 +03:00
Artem Tarasov
275a490545
Merge branch 'develop' into feature/doceditor-ssr
2022-02-02 19:26:51 +03:00
Artem Tarasov
bbdeeeb8b7
Web: nginx: fixed Host for doceditor
2022-02-02 18:54:12 +03:00
1908af64f0
cache: return support kafka. refactoring
2022-01-27 15:20:51 +03:00
e810605a4d
Web: Socket: Fix proxy ws by web:hub:url (appsettings.json)
2022-01-25 12:54:21 +03:00
Artem Tarasov
368989eae5
Config: nginx: added rule for nextjs (editor)
2022-01-21 01:17:01 +03:00
1a8d88345a
Merge branch 'hotfix/v1.1.1' into feature/socket-io
...
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
# yarn.lock
2022-01-17 19:02:40 +03:00
4319f5c656
fixed authentication/register.json
2022-01-14 16:56:23 +03:00
48897308d7
refactoring
2022-01-13 22:17:56 +03:00
6b883bcd60
Merge branch 'develop' into feature/support-elasticache
2022-01-13 18:16:43 +03:00
986d1d49e6
refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null
2022-01-13 14:24:14 +03:00
5bd347a775
refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null
2022-01-12 12:58:07 +03:00
efb51c613f
refactoring *.proto files according to https://bit.ly/3KcZ0Ef
2022-01-11 19:28:48 +03:00
6cbd02b71c
Merge branch 'hotfix/v1.1.1' into feature/socket-io
...
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# products/ASC.Files/Server/DocStore
# yarn.lock
2022-01-10 11:06:32 +03:00
a7dc8c7dfd
sync CommunityServer and AppServer cache via redis
2021-12-30 18:09:20 +03:00
bedfad1ec5
Merge branch 'master' into develop
...
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
44b227ba98
NLog: maxArchiveDays
2021-12-23 21:49:02 +03:00
6d250efffa
add *.dll for support redis + update Grpc.* dll
2021-12-23 16:17:31 +03:00
31f03a430b
Config: Restored old languages
2021-12-23 14:00:08 +03:00
d230a40e8e
Web: Socket: fixed cookies
2021-12-10 14:20:51 +03:00
8538b55dfc
Web: Turned on all languages
2021-12-09 21:45:10 +03:00
ed41326acc
Web: socket-io, first version
2021-12-09 15:50:50 +03:00
8abd9ef42b
Nlog: fixed configs
2021-12-08 22:17:39 +03:00
dec07c931c
moved from d50a38db
2021-11-29 18:40:22 +03:00
08746974f4
Web: SW: Added SW unregister + refactoring
2021-11-25 15:08:18 +03:00
f675415228
Merge branch 'master' into release/v1.1.0
...
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +03:00
d31ea87211
Merge branch 'master' into develop
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
307fc3e9b1
backup: update nginx config
2021-11-19 13:09:09 +03:00
1a282c2073
Config: Extra comma removed
2021-11-17 16:35:22 +03:00
cc35174d16
moved from 043e301
2021-11-16 20:40:15 +03:00
Sergey Kirichenko
48cf953913
Add cache for locales *.json
2021-11-12 19:17:09 +03:00
0215599566
merge from develop
2021-10-27 19:37:12 +03:00
403388fbf1
Added solution filter
...
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
Sergey Kirichenko
34378fa1e6
Modify nginx config ( #401 )
...
* Modify nginx config
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
2021-10-19 11:52:15 +03:00
Sergey Kirichenko
e85ed7a878
Add debuginfo.md to no-cache status
2021-10-17 21:18:01 +03:00
Sergey Kirichenko
439f1d0c18
Fix, do not cache remoteEntry.js
2021-10-15 12:52:13 +03:00
Sergey Kirichenko
86abb2812f
Fix Bug 53063 ( #397 )
2021-10-14 11:26:32 +03:00
Sergey Kirichenko
5d1bfbefa4
Modify docker images build ( #380 )
...
* Modify images build config
* Cosmetic modify
* Modify git clone ind Dockerfile
2021-10-06 16:43:18 +03:00
5d3d8f4d45
Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json'
2021-10-05 11:13:38 +03:00
9ce696e624
Web: Studio: Init Debug Info
...
+ Added About version from package.json
+ Fix DocumentServer version
2021-10-04 17:08:03 +03:00
febec81e59
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
2021-09-27 13:22:59 +03:00
3d0622c68b
Workbox: Config: Removed html from cache (issue with login/logout)
2021-09-27 13:22:52 +03:00
590db7bb67
Merge pull request #347 from ONLYOFFICE/feature/third
...
Feature/third
2021-09-27 12:35:07 +03:00
4531d38e6f
Web: Removed duplicates
2021-09-24 21:18:50 +03:00
6ada582cc5
Web: service-worker updates optimization
2021-09-24 20:10:54 +03:00
e755d2eda8
renamed providers to lowercase
2021-09-24 17:36:46 +03:00
bd9492b533
fixed version number
2021-09-24 11:06:57 +03:00
77323e02cc
fix Bug 50294
2021-09-14 22:19:26 +03:00
ea2c45ec55
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
2021-09-03 14:57:01 +03:00
fa204303f5
Merge branch 'develop' into release/1.0.0
2021-09-01 16:08:41 +03:00
9be5858ae7
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
2021-09-01 13:23:33 +05:00
fce956991e
nginx: fix
2021-08-31 18:38:59 +03:00
c66268a9c2
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/helpers/utils.js
2021-08-26 13:49:25 +03:00
cc2e2764d2
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
2021-08-23 14:47:02 +05:00
61528fb9c2
Merge branch 'develop' into feature/file-folder-selectors
2021-08-20 17:35:31 +03:00
9207238d8d
Merge branch 'develop' into release/1.0.0
2021-08-20 16:12:40 +03:00
9f83801f88
Nlog: optimization
2021-08-20 15:42:43 +03:00
f1e5076cb1
Web: added scripts path in nginx
2021-08-19 13:32:31 +03:00
3b8cf0a275
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
9873ea6fa0
Nginx: config for developers
2021-08-16 19:26:16 +03:00
f3ec5bb0e0
Nginx: static config
2021-08-16 15:18:45 +03:00
7e249a170e
removed socketio config
2021-08-12 15:58:56 +03:00
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log
...
Feature/log
2021-08-12 15:00:53 +03:00
999e1157d5
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# web/ASC.Web.Editor/src/Editor.jsx
2021-08-11 09:59:57 +03:00
af18e175dc
Merge branch 'develop' into release/1.0.0
2021-08-10 11:13:17 +03:00
e5c4770ae6
DB: fix connection string
2021-08-10 11:07:40 +03:00
5d840f65b1
DB: fix connection string
2021-08-10 11:03:11 +03:00
16469eb138
Api: added ConfigureNLogLogging
2021-08-08 15:56:54 +03:00
b6258b4ff1
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withLoader.js
2021-07-28 20:15:09 +03:00
75e7ca893f
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
2021-07-28 17:19:05 +03:00
cf7d002bc1
Merge branch 'develop' into feature/calendar
2021-07-28 12:16:39 +03:00
93d1cb0f38
Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF
2021-07-27 15:56:19 +03:00
f1668a3b43
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
2021-07-27 12:43:01 +03:00
e2d3f3195d
Merge branch 'develop' into release/1.0.0
2021-07-26 15:40:05 +03:00
cd8e752c03
Workbox config: minimized globPatterns (only js and css)
2021-07-26 15:38:55 +03:00
0f27a6c673
Merge branch 'develop' into release/1.0.0
2021-07-23 17:34:43 +03:00
675fb8de21
Web: Fix caching remoteEntry.js
2021-07-23 17:20:42 +03:00
fa500d094f
Merge branch 'develop' into release/1.0.0
2021-07-22 11:12:37 +03:00
13f8f5ef7d
Fix sw.js creation
2021-07-21 18:28:56 +03:00
653066af0c
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
eab97bbfed
Web: init new single sw.js creation
2021-07-20 12:32:27 +03:00
Sergey Kirichenko
5bcca1da75
Fix nginx config for cache config ( #306 )
...
* Fix cache-controll config
* Modify nginx cofig
2021-07-19 17:01:04 +03:00
95a7bdf7b5
Update onlyoffice.conf
2021-07-16 12:47:42 +03:00
Sergey Kirichenko
6ca5896715
Add etag config to proxy ( #301 )
...
* Add etag config to proxy
* Modify cache control
* Modify config
2021-07-15 12:01:04 +03:00
e81c3df0be
Added displaying version from appsettings.json (api/2.0/settings.json)
2021-07-14 17:31:06 +03:00
cb8d225707
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/src/store/index.js
2021-07-12 13:08:40 +03:00
2950f72bb8
Config: Restored appsettings config
2021-07-09 19:23:56 +03:00
b4c4625f3f
Moved getting firebase config to API method /api/2.0/settings.json
2021-07-09 18:28:08 +03:00
5cea2de9f6
Merge branch 'develop' into feature/personal
2021-07-09 16:29:14 +03:00
Sergey Kirichenko
9546e04e44
Add cache control in the backend proxy ( #299 )
...
* Modify cache control in the proxy
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Cosmetic modify
* Add expires conf
* Del swp file
2021-07-09 16:16:15 +03:00
a4a5a508bd
(onlyoffice.conf) Added location for icons from root.
2021-07-02 15:33:33 +03:00
fbcdba3b17
Merge branch 'develop' into feature/personal
2021-06-25 11:10:49 +03:00
Sergey Kirichenko
92684a2b3c
Modify elasticsearch configuration file ( #290 )
...
* Fix config elk json file
* Cosmetic modify
2021-06-25 10:14:53 +03:00
282738cb13
Merge branch 'develop' into feature/personal
2021-06-22 18:44:12 +03:00
Sergey Kirichenko
7af9bb08c9
Fix elasticsearch configure ( #285 )
2021-06-18 14:30:11 +03:00
6118e95028
Merge branch 'develop' into feature/personal
2021-06-17 14:25:09 +03:00
Sergey Kirichenko
a91ea81e89
Modify elasticsearch configuration ( #281 )
...
* Modify elasticsearch config
* Modify version ELK
* Cosmetic modify
2021-06-17 12:49:39 +03:00
b925943cb6
merge from develop
2021-06-07 17:23:25 +03:00
e43445cb2d
Config: Enabled personal mode in appsettings.json
2021-06-02 16:17:23 +03:00
0aa6a71ea8
Merge branch 'develop' into feature/translations
2021-06-02 14:05:43 +03:00
e9c5ca41ae
fix
2021-06-02 11:26:58 +03:00
d3e30eeb6c
Config: Setup cultures
2021-06-01 20:11:01 +03:00
95dbfb8c5c
Merge branch 'develop' into feature/translations
2021-06-01 20:02:48 +03:00
7ae9b19412
Web: Turn on new languages >= 78%
...
1. Language 'de' translated by '90%'
2. Language 'fr' translated by '54%'
3. Language 'it' translated by '78%'
4. Language 'lo' translated by '78%'
5. Language 'pt-BR' translated by '78%'
6. Language 'ro' translated by '78%'
7. Language 'ru' translated by '99%'
8. Language 'sk' translated by '19%'
9. Language 'en' translated by '100%'
2021-06-01 13:25:41 +03:00
2018820472
Merge branch 'develop' into feature/crm-migrate
2021-05-31 19:37:51 +03:00
0be4e07865
SsoAuth: 2e37dcd0
2021-05-31 11:35:42 +03:00
Vashchuk Nikita
82abf11109
Merge branch 'develop' into feature/calendar
...
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
# products/ASC.Calendar/Server/ASC.Calendar.csproj
# products/ASC.Calendar/Server/Controllers/CalendarController.cs
# products/ASC.Calendar/Server/Program.cs
# products/ASC.Calendar/Server/Properties/launchSettings.json
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
# products/ASC.Calendar/Server/Startup.cs
2021-05-18 13:24:02 +03:00
Vashchuk Nikita
94047ab0a1
Fix Calendar
2021-05-17 21:35:23 +03:00
85bd971735
Merge branch 'develop' into feature/translations
2021-05-14 12:07:48 +03:00
Vashchuk Nikita
bf41c21c4e
Add Radicale
2021-05-11 18:05:46 +03:00
9e40feb771
Added and applied Common.json for common translations (languages issue)
2021-04-29 10:14:47 +03:00
8816e535c1
merge from develop
2021-04-28 19:50:59 +03:00
d97928fd37
Merge branch 'develop' into feature/support-hosting-as-service
2021-04-26 19:52:32 +03:00
4c500aef82
Config: added de-DE culture
2021-04-24 10:43:33 +03:00
fc297faa52
Merge branch 'develop' into feature/products
2021-04-23 17:35:11 +03:00
2d8b085d02
add support WindowsService/systemd for IHostBuilder
...
listen unix socket if it setup for Kestrel Web Server
2021-04-23 16:54:39 +03:00
6a4fed2d2c
Init Calendar Server back-end
2021-04-21 21:47:27 +03:00
63a8caeb97
Init Mail Server back-end
2021-04-21 19:00:38 +03:00
Alexey Kostenko
71baafe682
Reverted kafka config
2021-04-21 16:08:24 +03:00
Alexey Kostenko
691e7d5498
Merge branch 'develop' into feature/oauth2.0
2021-04-21 15:04:26 +03:00
Alexey Kostenko
ef9fd0b9c0
Reverted kafka config
2021-04-08 12:00:57 +03:00
Alexey Kostenko
ec6c1df3cf
Merge branch 'develop' into feature/oauth2.0
2021-04-08 11:59:08 +03:00
NikitaVashchuk
6256c906f6
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
...
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
2021-04-05 18:29:13 +03:00
b9fe2c338f
Added New Proxy settings
2021-04-05 15:49:02 +03:00
c0582c1130
merge from develop
2021-04-01 16:28:36 +03:00
Alexey Kostenko
042d93deec
Web: Added simple static file to getting a token of a third-party service
2021-03-29 18:15:10 +03:00
b8d484e62f
fixed locales
2021-03-23 21:10:47 +03:00
dde8f97cfd
Nginx: conf
2021-03-23 18:34:59 +03:00
a8a6121e59
Web: Proxy fixes
2021-03-22 17:35:33 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
a015b618a2
Web: Client: Added new service-worker on workbox v6
2021-03-14 23:36:20 +03:00
c96e783eab
Web: Added new @appserver/editor app
2021-03-05 21:15:48 +03:00
35a4eca247
Web: Login: Fixed translation
2021-02-25 11:44:46 +03:00
083d25bcd6
CRM: продолжаю переносить проект
2021-02-24 19:50:07 +03:00
507fadff55
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/store/auth/selectors.js
# packages/asc-web-components/src/components/icons/svg/index.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# yarn.lock
2021-02-24 10:57:03 +03:00
34d9eed580
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# packages/asc-web-common/src/components/GroupSelector/GroupSelector.stories.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header-nav.js
# packages/asc-web-common/src/components/NavMenu/sub-components/header.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-item.js
# packages/asc-web-common/src/components/NavMenu/sub-components/nav-logo-item.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PeopleSelector/PeopleSelector.stories.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# packages/asc-web-common/src/store/AuthStore.js
# packages/asc-web-common/src/store/ModuleStore.js
# packages/asc-web-common/src/store/SettingsStore.js
# packages/asc-web-common/src/store/UserStore.js
# packages/asc-web-common/src/store/auth/actions.js
# packages/asc-web-common/src/store/auth/index.js
# packages/asc-web-common/src/store/auth/reducer.js
# packages/asc-web-common/src/store/auth/selectors.js
# products/ASC.Files/Client/config-overrides.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/Article/Header/index.js
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ConvertDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DeleteThirdPartyDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/DownloadDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/EmptyTrashDialog/index.js
# products/ASC.Files/Client/src/components/dialogs/ThirdPartyMoveDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/BadgesFileTile.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/ConnectedClouds.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/index.js
# products/ASC.Files/Client/src/components/panels/AddGroupsPanel/index.js
# products/ASC.Files/Client/src/components/panels/AddUsersPanel/index.js
# products/ASC.Files/Client/src/components/panels/ChangeOwnerPanel/index.js
# products/ASC.Files/Client/src/components/panels/EmbeddingPanel/index.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/ShareButton.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
# products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/helpers/i18n.js
# products/ASC.Files/Client/src/helpers/utils.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/rootReducer.js
# products/ASC.People/Client/config-overrides.js
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/Article/Body/index.js
# products/ASC.People/Client/src/components/Article/Header/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeEmailDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangePhoneDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserStatusDialog/index.js
# products/ASC.People/Client/src/components/dialogs/ChangeUserTypeDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DataLossWarningDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteProfileEverDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
# products/ASC.People/Client/src/components/dialogs/DeleteUsersDialog/index.js
# products/ASC.People/Client/src/components/dialogs/InviteDialog/index.js
# products/ASC.People/Client/src/components/dialogs/SendInviteDialog/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/GroupAction/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/userContent.js
# products/ASC.People/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Paging/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/avatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/components/pages/Reassign/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Reassign/index.js
# products/ASC.People/Client/src/helpers/i18n.js
# products/ASC.People/Client/src/helpers/utils.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/src/store/people/reducers.js
# products/ASC.People/Client/src/store/portal/actions.js
# products/ASC.People/Client/src/store/portal/reducers.js
# products/ASC.People/Client/src/store/profile/actions.js
# products/ASC.People/Client/src/store/profile/selectors.js
# products/ASC.People/Client/src/store/rootReducer.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/config-overrides.js
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateUser.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/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/advantagesContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/buttonContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/contactContainer.js
# web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/headerContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/custom-titles.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/language-and-time-zone.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/common/whitelabel.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/modules.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/owner.js
# web/ASC.Web.Client/src/components/pages/ThirdParty/index.js
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/helpers/i18n.js
# web/ASC.Web.Client/src/helpers/utils.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Client/src/store/confirm/actions.js
# web/ASC.Web.Client/src/store/payments/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Client/src/store/settings/selectors.js
# web/ASC.Web.Client/src/store/store.js
# web/ASC.Web.Client/src/store/wizard/actions.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
2021-02-24 10:30:42 +03:00
6c80ebdff0
Merge branch 'develop' into feature/mobx
...
# Conflicts:
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# products/ASC.People/Client/src/App.js
# products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/index.js
# products/ASC.People/Client/src/store/group/actions.js
# products/ASC.People/Client/src/store/people/actions.js
# products/ASC.People/Client/src/store/people/selectors.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/About/index.js
# web/ASC.Web.Client/src/components/pages/Home/index.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/NavMenu/index.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-nav.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/header.js
# web/ASC.Web.Common/src/components/NavMenu/sub-components/nav-item.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/store/auth/actions.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/store/auth/selectors.js
# web/ASC.Web.Components/src/components/loader/types/rombs.js
2021-02-20 17:31:58 +03:00
d8bd3f6e7c
Web: Files: Simplified translation
2021-02-19 21:57:01 +03:00
e97ba3a8b3
Web: People: Simplified translation
2021-02-19 19:27:13 +03:00
TatianaLopaeva
af5fd0a0cb
Added location for images from root into config. (onlyoffice.conf)
2021-02-19 14:41:19 +03:00
Ilya Oleshko
b53557cedc
Merge branch 'develop' into feature/not-implemented-page
2021-02-18 15:56:39 +03:00
ac51e3f7a3
Nginx: fix routing
2021-02-17 16:41:29 +03:00
Ilya Oleshko
f2f2fbc07c
Merge branch 'develop' into feature/not-implemented-page
2021-02-15 10:58:34 +03:00
a12cf74638
fixed login handler
2021-02-10 22:43:18 +03:00
Sergey Kirichenko
4337130c5e
Modify file json format
2021-02-05 11:20:42 +03:00
61cfd029d9
Added CRM
2021-01-26 20:36:03 +03:00
