|
a44d24d86f
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-30 16:24:04 +03:00 |
|
Viktor Fomin
|
8f97413d1d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-30 12:33:31 +03:00 |
|
|
baedfcc93a
|
fixed performance issue
|
2022-11-29 16:47:26 +03:00 |
|
|
b9f45035b9
|
Merge branch 'release/rc-v1.2.0' into feature/migration_personal
# Conflicts:
# common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
|
2022-11-29 13:07:12 +03:00 |
|
Viktor Fomin
|
366d92abb2
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-28 12:09:11 +03:00 |
|
Sergey Kirichenko
|
dfa948d5b3
|
Delete docker services (#1081)
|
2022-11-24 17:47:27 +03:00 |
|
Viktor Fomin
|
1fb1228dbd
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-24 02:33:13 +05:00 |
|
|
d3d91ba54e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-23 19:57:15 +03:00 |
|
|
ff5272dee3
|
Config: Added blank appsettings.dev.json for docker containers
|
2022-11-22 12:05:39 +03:00 |
|
Vlada Gazizova
|
f3d9aa918d
|
Web:Formatted appsettings.json.
|
2022-11-21 16:22:59 +03:00 |
|
Vlada Gazizova
|
5884fa7acd
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-21 11:15:55 +03:00 |
|
|
29d52e6d06
|
Web:Change themelimit.
|
2022-11-21 11:04:19 +03:00 |
|
|
35e22fe8c8
|
Merge branch 'develop' into feature/fix-whitelable
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Core/LogoUploader.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-11-18 16:48:19 +03:00 |
|
|
8ab20eea79
|
Merge branch 'develop' into feature/api-origin
|
2022-11-17 18:16:43 +03:00 |
|
|
cce692a601
|
Delete redis.test.json
|
2022-11-17 17:39:44 +03:00 |
|
|
999e892b7e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-17 17:30:46 +03:00 |
|
|
af88793aa4
|
Merge branch 'develop' into feature/api-origin
|
2022-11-17 16:09:15 +03:00 |
|
|
22c6aa6896
|
Api: cors support
|
2022-11-17 15:58:40 +03:00 |
|
sk81.biz@gmail.com
|
cb5c90f700
|
Fix nginx cors error
|
2022-11-16 19:02:48 +03:00 |
|
|
e50833f7f3
|
common settings for configure aws cloudwatch credentials
|
2022-11-16 12:44:53 +03:00 |
|
|
b379931d1f
|
fix whitelabel
|
2022-11-15 14:11:44 +03:00 |
|
|
7856f6894f
|
Web:Change thelimit to 11.
|
2022-11-14 15:43:22 +03:00 |
|
|
aa0222f078
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-11 15:05:26 +03:00 |
|
|
991620468d
|
change format logs for CloudWatch
|
2022-11-08 15:37:52 +03:00 |
|
|
14a64f4ad0
|
Merge branch 'develop' into feature/remove-waste
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
|
2022-11-07 11:25:54 +03:00 |
|
|
e765272e7a
|
fixed appsettings.json
|
2022-11-01 15:24:17 +03:00 |
|
|
52b23cbf8b
|
healthcheck: added to ApiSystem/ClearEvents services. refactoring
|
2022-10-31 16:13:45 +03:00 |
|
|
a414d68182
|
Merge branch 'develop' into feature/migration_personal
# Conflicts:
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/CrmModuleSpecifics.cs
# common/ASC.Data.Storage/StorageFactory.cs
|
2022-10-28 12:16:36 +03:00 |
|
|
206aabc628
|
activemq: added configs
|
2022-10-24 14:48:53 +03:00 |
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
16bb42d0af
|
fix ASC.Data.Storage.Encryption
|
2022-10-19 13:12:33 +03:00 |
|
|
5c5f841e8e
|
ApiSystem: fix
|
2022-10-14 17:55:43 +03:00 |
|
|
e2ccab3c97
|
ApiSystem: fix
|
2022-10-14 17:52:00 +03:00 |
|
|
d5d78e7550
|
Merge pull request #892 from ONLYOFFICE/feature/local-restore
fix local restore
|
2022-10-13 16:22:59 +03:00 |
|
|
c1208e931a
|
added support ActiveMQ EventBus
|
2022-10-12 14:43:00 +03:00 |
|
|
ded6b08e0e
|
fix GetTmpFilePath
|
2022-10-11 15:29:23 +03:00 |
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
mushka
|
29f0041529
|
discarded feed changes
|
2022-10-07 17:16:32 +03:00 |
|
mushka
|
681cfbfc12
|
changed feed.json config file
|
2022-09-26 12:55:42 +03:00 |
|
mushka
|
dff874b936
|
removed params from feed config
|
2022-09-26 10:43:56 +03:00 |
|
|
6448b63318
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
|
2022-09-19 18:16:34 +03:00 |
|
|
a51cde20c7
|
Merge branch 'develop' into feature/doc-space-info-panel
# Conflicts:
# products/ASC.Files/Service/Extensions/ConfigurationManagerExtension.cs
|
2022-09-16 18:26:36 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +03:00 |
|
mushka
|
29693baeaa
|
temporarily changed feed.config
|
2022-09-16 15:19:12 +03:00 |
|
|
ee27ad4437
|
nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property
|
2022-09-15 17:44:04 +03:00 |
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
|
c2cbd25c4c
|
redditmq: fixed config setup
|
2022-09-09 15:56:24 +03:00 |
|
|
c406170c29
|
Feed: fix
|
2022-09-09 13:46:02 +03:00 |
|
|
2556c805d3
|
File.Service: added feed config
|
2022-09-09 13:38:29 +03:00 |
|
|
371195e43f
|
Merge branch 'develop' into feature/migration_personal
|
2022-09-09 12:28:56 +03:00 |
|
|
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 |
|
|
5d7998688d
|
Merge branch 'develop' into feature/migration_personal
|
2022-09-05 17:39:20 +03:00 |
|
|
e4d379c411
|
backup: add regions
|
2022-09-05 14:27:38 +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 |
|