|
|
9abc4e8149
|
FormRoomPdf: .oform has been removed from form filling formats
|
2023-12-28 11:30:56 +03:00 |
|
|
|
1c7a26aa34
|
added pdf as a form filling format
|
2023-12-26 14:10:17 +03:00 |
|
|
|
289f9125d5
|
added accounts route
|
2023-12-22 12:39:54 +03:00 |
|
|
|
830c93f2a7
|
Merge pull request #113 from ONLYOFFICE/feature/add-pdf-in-encrypted-docs
add pdf in encrypted-docs
|
2023-12-21 15:18:27 +03:00 |
|
|
|
6c0491f479
|
Merge branch 'hotfix/v2.0.1' into develop
|
2023-12-21 14:13:51 +04:00 |
|
|
|
2ca6c15c85
|
add pdf encrypted-docs
|
2023-12-21 12:56:53 +03:00 |
|
|
|
96ac38206c
|
cfg: firebaseio.com added to scp rules
|
2023-12-21 11:17:59 +03:00 |
|
|
|
6c2211e231
|
Merge branch 'hotfix/v2.0.1' into develop
# Conflicts:
# install/OneClickInstall/install-Debian.sh
# install/deb/debian/rules
|
2023-12-13 20:00:06 +04:00 |
|
|
|
71ab067f76
|
fix
|
2023-12-13 17:51:07 +03:00 |
|
|
|
7124919ad5
|
Settings: ForumLink
|
2023-12-13 17:45:34 +03:00 |
|
|
|
1c9e58095d
|
Nginx: Restored nocache for api.js
|
2023-12-13 15:52:50 +04:00 |
|
|
|
087574d441
|
Merge pull request #106 from ONLYOFFICE/feature/plugins-cfg-refactoring
Feature/plugins cfg refactoring
|
2023-12-13 12:06:06 +03:00 |
|
|
|
67b7fcfe89
|
fixed cultures order
|
2023-12-12 17:03:22 +03:00 |
|
|
|
888df52b99
|
appsettings: WebPluginSettings: the array of allowed actions is divided into separate fields
|
2023-12-12 14:44:19 +03:00 |
|
|
|
7f95eabddd
|
redis: configure PoolSize and WorkCount
|
2023-12-08 18:31:44 +03:00 |
|
|
|
2c5af9dfa4
|
Merge pull request #75 from ONLYOFFICE/feature/management
Feature/management
|
2023-12-07 18:20:50 +04:00 |
|
|
|
f05326047b
|
Merge pull request #68 from ONLYOFFICE/feature/distributed-lock
Feature/distributed lock
|
2023-12-07 05:32:05 -08:00 |
|
|
|
f7ced5afec
|
Merge branch 'hotfix/v2.0.1' into develop
|
2023-12-06 15:51:24 +04:00 |
|
|
|
945aaa4bea
|
Fix bug 64321 (#95)
|
2023-12-04 17:39:20 +03:00 |
|
|
|
f4a5755811
|
Merge branch 'release/v2.0.0' into develop
|
2023-12-04 13:47:20 +04:00 |
|
|
|
bd1d5921d9
|
Allow upload and delete plugins (#93)
|
2023-12-01 16:33:29 +03:00 |
|
|
|
fc5ea963ed
|
Merge branch 'develop' into feature/data-migration
|
2023-11-30 19:06:36 +04:00 |
|
|
|
ed09909094
|
Fix This document requires 'TrustedScriptURL' assignment in Chrome docker dev
|
2023-11-30 19:03:55 +04:00 |
|
|
|
f343be9dcf
|
Merge branch 'develop' into feature/data-migration
|
2023-11-30 10:39:54 +03:00 |
|
|
|
ff453ea19e
|
cfg: storage: visible false for systemwebplugins
|
2023-11-29 18:23:07 +03:00 |
|
|
|
0ec94ce27a
|
Implement OWASP recomendations (#79)
|
2023-11-29 13:30:42 +03:00 |
|
|
|
71d0ff0c6a
|
Merge branch 'develop' into feature/management
|
2023-11-28 17:10:57 +04:00 |
|
|
|
a374e9aefe
|
added zookeeper test configuration
|
2023-11-28 15:28:10 +03:00 |
|
|
|
47626e599a
|
Removed useless files and scripts for ASC.TelegramReports
|
2023-11-28 15:43:48 +04:00 |
|
|
|
1a3e3f69e0
|
dynamoDB:tableName
|
2023-11-27 16:03:41 +03:00 |
|
|
|
e6bc5bceea
|
fix Bug 64628 - Fix log level for error failed to get redis key (#70)
|
2023-11-24 16:17:39 +03:00 |
|
|
|
540811f08d
|
added zookeeper configuration
|
2023-11-23 13:43:16 +03:00 |
|
|
|
055a836888
|
Merge branch 'develop' into feature/data-migration
|
2023-11-22 17:35:37 +04:00 |
|
|
|
b064d127fe
|
Merge branch 'develop' into feature/management
|
2023-11-21 12:37:38 +04:00 |
|
|
|
baa76f4994
|
fix Bug 65120
|
2023-11-15 11:04:54 +03:00 |
|
|
|
55ab636f41
|
Merge pull request #61 from ONLYOFFICE/feature/scripts-caching
Restored cache control for some files in client/public/scripts
|
2023-11-14 14:15:32 +04:00 |
|
|
|
5a20174e70
|
increase alias max lenght
|
2023-11-14 11:52:59 +03:00 |
|
|
|
0ebba09b22
|
fix Bug 65064
|
2023-11-13 10:33:58 +03:00 |
|
|
|
24a174e26c
|
Restored cache control for some files in client/public/scripts
|
2023-11-13 03:27:19 +04:00 |
|
|
|
bf46514e13
|
Merge branch 'develop' into feature/management
|
2023-11-10 14:23:08 +04:00 |
|
|
|
8b4c71be7e
|
Merge pull request #54 from ONLYOFFICE/bugfix/64923
Bugfix/64923
|
2023-11-09 07:18:39 -08:00 |
|
|
|
79a4e818d2
|
Merge branch 'develop' into feature/management
# Conflicts:
# build.backend.docker.ps1
# build.backend.docker.sh
# clear.backend.docker.ps1
# clear.backend.docker.sh
# start/start.backend.docker.ps1
# start/start.backend.docker.sh
|
2023-11-09 19:00:55 +05:00 |
|
|
|
6ac0c7e783
|
Merge remote-tracking branch 'remotes/origin/release/v2.0.0' into bugfix/64923
# Conflicts:
# config/appsettings.json
|
2023-11-09 15:42:05 +03:00 |
|
|
|
8ce55ae9b9
|
fix Bug 64923 ( added frame-src, connect-src, media-src )
|
2023-11-09 15:35:20 +03:00 |
|
|
|
8e8d381514
|
fix bug 65011
|
2023-11-09 15:17:43 +03:00 |
|
|
|
1d5a4ffea8
|
Merge branch 'release/v2.0.0' into bugfix/64787
|
2023-11-09 13:58:52 +04:00 |
|
|
|
ae6e20522a
|
csp only for html
|
2023-11-08 23:53:42 +03:00 |
|
|
|
374099b1e5
|
csp only for html
|
2023-11-08 19:19:04 +03:00 |
|
|
|
d7fe0c18d3
|
OFormSettings: added dashboard path
|
2023-11-07 15:28:04 +03:00 |
|
|
|
c85d82d4d2
|
added AWS DynamoDB connection string
|
2023-11-07 13:09:44 +03:00 |
|
|
|
eabddf8efb
|
nlog: ignore /health/ requests
|
2023-11-05 18:36:21 +03:00 |
|
|
|
b136ff88fb
|
fix bug 64787
|
2023-11-02 18:43:46 +03:00 |
|
|
|
6f1090785f
|
Merge pull request #25 from ONLYOFFICE/bugfix/64684
Store: added IDataStoreValidator
|
2023-11-01 05:54:23 -07:00 |
|
|
|
1e00e70556
|
fix backup.json
|
2023-11-01 15:48:14 +03:00 |
|
|
|
7eeb155b4e
|
fix Bug 64628 - Fix log level for error failed to get redis key
|
2023-11-01 16:47:46 +07:00 |
|
|
|
6230df5c40
|
fix Bug 64869
|
2023-10-30 20:33:01 +03:00 |
|
|
|
97e22f5424
|
config: added storage for rebranding logos
|
2023-10-27 16:11:29 +03:00 |
|
|
|
b8cdde4db0
|
fix Bug 64787
|
2023-10-24 20:01:16 +03:00 |
|
|
|
103e93dbab
|
fix Bug 64808
|
2023-10-24 18:58:28 +03:00 |
|
|
|
2b112d9344
|
Store: added IDataStoreValidator
|
2023-10-20 17:25:21 +03:00 |
|
|
|
bc9f3f5c07
|
Cfg: fixed UserNameRegex
|
2023-10-20 16:31:19 +03:00 |
|
|
|
38dd71539b
|
Cfg: added UserNameRegex
|
2023-10-20 14:47:57 +03:00 |
|
|
|
7079467cc8
|
Add gzip config level to router (#16)
* Modify gzip config level and proxied
* Modify gzip config
* Modify gzip config
|
2023-10-12 18:44:39 +03:00 |
|
DmitrySychugov
|
0266838db5
|
Merge branch 'develop' into feature/management
# Conflicts:
# build.backend.docker.sh
# build.static.bat
# common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs
# common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs
# common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs
# common/ASC.Data.Backup.Core/Service/BackupService.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/services/ASC.ApiSystem/ASC.ApiSystem.csproj
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ApiSystem/Controllers/SettingsController.cs
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Models/SettingsModel.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup/Api/BackupController.cs
# common/services/ASC.Data.Backup/ApiModels/BackupDto.cs
# common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs
# common/services/ASC.Data.Backup/GlobalUsings.cs
# frontend.code-workspace
# frontend.macos.code-workspace
# migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
# package.json
# packages/client/package.json
# packages/client/src/components/MainBar/index.js
# packages/client/src/components/NavMenu/index.js
# packages/client/src/components/NavMenu/sub-components/header-nav.js
# packages/client/src/components/NavMenu/sub-components/header.js
# packages/client/src/pages/Confirm/sub-components/auth.js
# packages/client/src/pages/PortalSettings/categories/common/Branding/additionalResources.js
# packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
# packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/common/sub-components/loaderWhiteLabel.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/index.js
# packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/client/webpack.config.js
# packages/common/api/index.js
# packages/common/api/portal/index.js
# packages/common/components/Article/index.js
# packages/common/components/Article/sub-components/article-apps.js
# packages/common/components/Article/sub-components/article-header.js
# packages/common/components/Article/sub-components/article-hide-menu-button.js
# packages/common/components/Article/sub-components/article-profile.js
# packages/common/store/AuthStore.js
# packages/common/store/SettingsStore.js
# packages/common/utils/axiosClient.js
# packages/common/utils/whiteLabelHelper.js
# packages/components/context-menu/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
# public/locales/en/Common.json
# public/scripts/config.json
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
# yarn.lock
|
2023-10-04 21:06:09 +05:00 |
|
|
|
ce19e172c4
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# ASC.Web.sln
# ASC.Web.slnf
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Data.Storage/DataOperators/DataOperatorFactory.cs
# common/ASC.Data.Storage/DataOperators/IDataOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/BaseReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/TarReadOperator.cs
# common/ASC.Data.Storage/DataOperators/ReadOperators/ZipReadOperator.cs
# common/ASC.Migration/ASC.Migration.Core.csproj
# common/ASC.Migration/Core/AbstractMigration.cs
# common/ASC.Migration/Core/IMigration.cs
# common/ASC.Migration/Core/ImportableEntity.cs
# common/ASC.Migration/Core/MigrationIntegrationEvent.cs
# common/ASC.Migration/Core/MigrationIntegrationEventHandler.cs
# common/ASC.Migration/Core/MigrationLogger.cs
# common/ASC.Migration/Core/MigrationParseIntegrationEvent.cs
# common/ASC.Migration/Core/Models/Api/ImportableApiEntity.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiFiles.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiGroup.cs
# common/ASC.Migration/Core/Models/Api/MigratingApiUser.cs
# common/ASC.Migration/Core/Models/Api/MigrationApiInfo.cs
# common/ASC.Migration/Core/Models/Api/MigrationCore.cs
# common/ASC.Migration/Core/Models/Api/MigratorMeta.cs
# common/ASC.Migration/Core/Models/MigratingFiles.cs
# common/ASC.Migration/Core/Models/MigratingUser.cs
# common/ASC.Migration/Core/Models/MigrationInfo.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceFiles.cs
# common/ASC.Migration/Core/Providers/ASC/Models/Parse/WorkspaceUser.cs
# common/ASC.Migration/Core/Providers/ASC/Models/WorkspaceMigrationInfo.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/GoogleWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingFiles.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigratingUser.cs
# common/ASC.Migration/Core/Providers/GoogleWorkspace/Models/GWSMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigratingUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/NCMigrationInfo.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/Models/Parse/NCUser.cs
# common/ASC.Migration/Core/Providers/NextcloudWorkspace/NextcloudWorkspaceMigration.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingFiles.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigratingUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/OCMigrationinfo.cs
# common/ASC.Migration/Core/Providers/OwnCloud/Models/Parse/OCUser.cs
# common/ASC.Migration/Core/Providers/OwnCloud/OwnCloudMigration.cs
# common/ASC.Migration/GlobalUsings.cs
# common/ASC.Migration/Resources/MigrationResource.Designer.cs
# common/ASC.Migration/Resources/MigrationResource.resx
# config/nginx/onlyoffice.conf
# packages/client/public/locales/en/People.json
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/People.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/components/dialogs/index.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/Webhooks/WebhookHistory/sub-components/HistoryHeader.js
# packages/client/src/pages/PortalSettings/utils/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/client/src/routes/portalSettings.js
# packages/client/src/store/DialogsStore.js
# packages/client/src/store/index.js
# packages/common/api/settings/index.js
# packages/common/utils/axiosClient.js
# packages/components/file-input/index.js
# packages/components/paging/index.js
# packages/components/paging/styled-paging.js
# packages/components/progress-bar/index.js
# packages/components/table-container/TableGroupMenu.js
# packages/components/table-container/TableHeaderCell.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
# products/ASC.Files/Core/Core/CountRoomFeature.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Startup.cs
# products/ASC.People/Server/Startup.cs
# public/locales/en/Common.json
# public/locales/ru/Common.json
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/ApiModels/RequestsDto/FinishDto.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/MigrationStatusDto.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
# web/ASC.Web.Studio/GlobalUsings.cs
# web/ASC.Web.Studio/IntegrationEvents/RemovePortalIntegrationEventHandler.cs
# web/ASC.Web.Studio/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2023-10-04 14:49:14 +04:00 |
|
|
|
bc9f96ee7d
|
Fix bad merge
|
2023-10-03 19:13:51 +04:00 |
|
|
|
78a222ebd1
|
merge from develop
|
2023-10-03 17:38:22 +03:00 |
|
|
|
25241c61d4
|
drop all files for backend/frontend
|
2023-10-02 13:23:37 +03:00 |
|
|
|
09466caed0
|
moved config to build/condig folder
|
2023-10-02 13:16:45 +03:00 |
|
|
|
55d92a8fa6
|
nginx: fixed log
|
2023-09-29 21:59:55 +03:00 |
|
|
|
4d19a8b212
|
Merge pull request #1675 from ONLYOFFICE/feature/web-plugins
Feature/web plugins
|
2023-09-29 18:58:13 +04:00 |
|
|
|
18d5c7c659
|
Web: disable upload and delete plugin
|
2023-09-29 17:45:28 +03:00 |
|
|
|
2987cf797b
|
nginx: support pass for redis. bug fixed
|
2023-09-29 17:26:43 +03:00 |
|
|
|
0d8bd872d6
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 17:21:34 +04:00 |
|
|
|
e4faab8fc1
|
Nginx: Removed useless temp route
|
2023-09-29 15:23:04 +04:00 |
|
|
|
aa26f284fa
|
Merge branch 'feature/web-plugins' of github.com:ONLYOFFICE/DocSpace into feature/web-plugins
|
2023-09-29 10:36:31 +03:00 |
|
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
Elyor Djalilov
|
3116c25d9f
|
Merge branch 'develop' into feature/data-migration
|
2023-09-28 18:17:38 +05:00 |
|
|
|
006c552ae6
|
Merge remote-tracking branch 'remotes/origin/feature/web-plugins' into feature/system-web-plugins
|
2023-09-26 14:40:33 +03:00 |
|
|
|
6af5cf8295
|
ASC.Web.Core: WebPluginManager: read system plugins from storage
|
2023-09-26 14:37:57 +03:00 |
|
Viktor Fomin
|
26bb33516a
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-26 13:06:45 +03:00 |
|
|
|
8b3ddf69f3
|
fix merge
|
2023-09-25 11:45:29 +03:00 |
|
Viktor Fomin
|
c30c6742a2
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-25 11:00:51 +03:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
Viktor Fomin
|
4719e679d9
|
Nginx: add sendtgreport location
|
2023-09-24 21:29:36 +03:00 |
|
Viktor Fomin
|
e45c17b03b
|
Merge branch 'develop' into feature/tg-reports
|
2023-09-24 11:49:14 +03:00 |
|
|
|
dc27c8d8fc
|
nlog: fixed
|
2023-09-23 09:50:53 +03:00 |
|
|
|
5a530364c7
|
nlog: remove /health logs
|
2023-09-22 13:15:44 +03:00 |
|
Viktor Fomin
|
4a9ed75b2b
|
Config: add telegramConf
|
2023-09-21 14:56:57 +03:00 |
|
Elyor Djalilov
|
94685e3794
|
Merge branch 'develop' into feature/data-migration
# Conflicts:
# common/ASC.Data.Storage/DataOperators/WriteOperators/ZipWriteOperator.cs
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/ru/Settings.json
# packages/client/src/store/DialogsStore.js
# packages/client/src/store/index.js
# products/ASC.People/Server/Startup.cs
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2023-09-21 15:30:39 +05:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
|
|
b25b39da14
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-20 14:55:39 +03:00 |
|
|
|
94bf145445
|
Merge branch 'develop' into feature/urlShortener
|
2023-09-19 19:45:18 +03:00 |
|
|
|
c1a75f0ae2
|
ASC.Web.Core: WebPluginManager: small fixes
|
2023-09-19 14:06:04 +03:00 |
|
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
|
|
f15953bbe4
|
Revert "oform" config + added "upload" section
|
2023-09-19 13:43:26 +04:00 |
|
|
|
4b368870ab
|
Added new FormGallery config (+ extended API settings)
|
2023-09-19 13:11:34 +04:00 |
|
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
|
|
c3276c3146
|
Merge remote-tracking branch 'remotes/origin/feature/web-plugins' into feature/system-web-plugins
|
2023-09-18 14:00:54 +03:00 |
|
|
|
2783548a5f
|
ASC.Web.Core: WebPluginManager: trying to read system plugins by url
|
2023-09-15 19:20:45 +03:00 |
|
|
|
291ae6da13
|
Csp: oform
|
2023-09-15 11:25:11 +03:00 |
|
|
|
06078ffd2d
|
Oauth: Twitter
|
2023-09-15 00:01:08 +03:00 |
|
|
|
d0b16d8b8d
|
Auth: fix apple
|
2023-09-14 18:00:34 +03:00 |
|
|
|
7aff59b652
|
update urlShortener
|
2023-09-13 16:49:29 +03:00 |
|
|
|
d68b8c4895
|
Web: enable plugins
|
2023-09-13 16:29:01 +03:00 |
|
|
|
65a43a86dd
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-13 10:14:35 +03:00 |
|
|
|
c226be46ff
|
Csp: domains from config
|
2023-09-11 15:00:04 +03:00 |
|
gazizova-vlada
|
5cd7202515
|
Merge branch 'develop' into feature/rooms-icons
|
2023-09-11 11:58:06 +03:00 |
|
|
|
bf0ef4cbd1
|
Files: logo colors moved to conf
|
2023-09-08 17:35:17 +03:00 |
|
mushka-n
|
e1d989c6d2
|
merge develop + merge fix
|
2023-09-08 03:27:39 +03:00 |
|
Elyor Djalilov
|
5384062ad0
|
Merge branch 'develop' into feature/data-migration
|
2023-09-07 15:40:07 +05:00 |
|
|
|
f5bad20c76
|
Merge branch 'develop' into feature/management
|
2023-09-06 19:17:17 +04:00 |
|
|
|
bc57cd84d0
|
build: docker: dev: added dnsmasq for local domain routing
|
2023-09-06 18:24:58 +04:00 |
|
Vladimir Khvan
|
07519d4109
|
Merge branch 'develop' into feature/data-migration
|
2023-09-06 12:33:23 +05:00 |
|
|
|
bb7da689cb
|
ASC.Web.Core: WebPluginManager: separate storage for system plugins
|
2023-09-05 18:44:14 +03:00 |
|
Viktor Fomin
|
3668d75450
|
Merge branch 'develop' into feature/management
|
2023-09-05 18:34:41 +03:00 |
|
|
|
96b916d81e
|
Merge branch 'hotfix/v1.1.3' into develop
|
2023-09-05 09:45:42 +04:00 |
|
|
|
2b86dd25df
|
Merge branch 'develop' into feature/change-chunk-size-s3-copy-and-backup
# Conflicts:
# config/backup.json
|
2023-09-04 23:11:47 +03:00 |
|
|
|
d864448da5
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# products/ASC.Files/Core/Core/VirtualRooms/InvitationLinkService.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/PortalController.cs
|
2023-09-04 23:01:50 +03:00 |
|
|
|
d3198671ba
|
Merge remote-tracking branch 'remotes/origin/hotfix/v1.1.3' into feature/zoom-login
# Conflicts:
# packages/common/constants/index.js
|
2023-09-04 16:38:06 +03:00 |
|
|
|
5730a393f0
|
Merge branch 'develop' into feature/management
|
2023-09-04 12:23:29 +04:00 |
|
Vladimir Khvan
|
d24faf9716
|
Merge branch 'develop' into feature/data-migration
|
2023-09-04 13:21:56 +05:00 |
|
|
|
d77e8a1771
|
Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
# packages/common/store/SettingsStore.js
|
2023-09-01 16:42:08 +02:00 |
|
gazizova-vlada
|
6de452efac
|
Merge branch 'develop' into feature/login-settings
|
2023-09-01 16:56:55 +03:00 |
|
|
|
efdd42f8f6
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-09-01 15:30:48 +02:00 |
|
|
|
60748c93b1
|
fix Bug 63937
|
2023-09-01 15:59:10 +03:00 |
|
|
|
3e6a417d19
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# yarn.lock
|
2023-09-01 15:33:39 +03:00 |
|
|
|
8229b56342
|
change chunk size
|
2023-09-01 15:02:36 +03:00 |
|
|
|
41c581d621
|
fix migration path
|
2023-08-31 11:48:36 +03:00 |
|
|
|
b94486328f
|
Sso: settings.
|
2023-08-31 11:17:35 +03:00 |
|
gazizova-vlada
|
629b42161c
|
Merge branch 'develop' into feature/login-settings
|
2023-08-31 09:57:26 +03:00 |
|
|
|
03a70757ab
|
migration: add uploader
|
2023-08-30 19:40:45 +03:00 |
|
|
|
dc31122bb3
|
Csp: set header only for static and get requests
|
2023-08-30 12:56:23 +03:00 |
|
|
|
5e79ebe967
|
Added new language (ar-SA)
|
2023-08-30 12:03:34 +04:00 |
|
Eloncase
|
65fa314059
|
apisystem: zoom: handle store link
# Conflicts:
# common/services/ASC.ApiSystem/Controllers/ZoomController.cs
|
2023-08-29 14:04:40 +03:00 |
|
Eloncase
|
86eaf2dd8d
|
FederatedLogin: zoom login provider
|
2023-08-29 14:00:31 +03:00 |
|
|
|
76b4a660ca
|
Config: disable web-plugins
|
2023-08-29 11:57:22 +03:00 |
|
|
|
3e0910df17
|
Merge branch 'develop' into feature/web-plugins
|
2023-08-29 09:56:40 +03:00 |
|
|
|
bc6b0d9e0d
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/Billing/ITariffService.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/EmailSenderSink.cs
# common/ASC.Core.Common/Notify/JabberSenderSink.cs
# common/ASC.Core.Common/Notify/PushSenderSink.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
# migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
# migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
# migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
# migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
# migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
# migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
# migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
# migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
# packages/client/src/helpers/constants.js
# packages/client/src/pages/Files.jsx
# packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/security/index.js
# packages/client/src/pages/Profile/Section/Header/index.js
# packages/common/store/SettingsStore.js
# packages/components/drop-down/index.js
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SecurityController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/TagsController.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/FeedController.cs
# web/ASC.Web.Api/Api/PaymentsController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/Core/DnsSettings.cs
# web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
# web/ASC.Web.Api/GlobalUsings.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
# yarn.lock
|
2023-08-28 18:53:10 +03:00 |
|
Vladimir Khvan
|
91bb8c931c
|
Merge branch 'develop' into feature/data-migration
|
2023-08-25 16:07:30 +05:00 |
|
|
|
a8c133f4ca
|
fix backup upload handler
|
2023-08-25 12:51:15 +03:00 |
|
|
|
5aa6dcd2ee
|
Nginx: fix url shortener
|
2023-08-25 10:14:26 +03:00 |
|
|
|
9f9a3807bc
|
Web: Config: Added nginx rewrite from /management to /
|
2023-08-25 10:09:22 +03:00 |
|
|
|
076dfd78e5
|
Fix 404 error after reload page at trash
|
2023-08-24 17:46:38 +03:00 |
|
|
|
27db5ac720
|
ASC.Web.Core: BruteForceLoginManager: added recaptcha check
|
2023-08-21 17:26:24 +03:00 |
|
Vladimir Khvan
|
29e4d708d5
|
Merge branch 'develop' into feature/data-migration
|
2023-08-18 17:30:30 +05:00 |
|
|
|
f1d65084d7
|
Referrer-Policy "same-origin"
|
2023-08-18 13:27:25 +03:00 |
|
|
|
d1e301e9e9
|
removed Strict-Transport-Security for http
|
2023-08-18 12:57:06 +03:00 |
|
|
|
16880f92aa
|
updated Strict-Transport-Security header
|
2023-08-18 12:33:53 +03:00 |
|
