Commit Graph

71 Commits

Author SHA1 Message Date
69d3dadc13 Merge branch 'hotfix/v2.0.1' into develop 2023-12-13 20:01:17 +04:00
7fe587d374 Fix download changed version of embedded api.js (cache issue) 2023-12-13 15:52:14 +04:00
e347aacf11 Merge branch 'develop' into feature/management
# Conflicts:
#	package.json
#	yarn.lock
2023-11-21 12:40:25 +04:00
c202911fec
Merge pull request #70 from ONLYOFFICE/feature/scripts-caching
Added new caching rules for files in public/scripts
2023-11-14 14:13:56 +04:00
0ce050341b Moved hooks (useLoadingWithTimeout, useViewEffect) to client () 2023-11-13 15:40:15 +04:00
1dcdccb590 Added new caching rules for files in public/scripts 2023-11-13 03:25:32 +04:00
b1ed10166c Merge branch 'develop' into feature/management
# Conflicts:
#	yarn.lock
2023-11-10 23:06:29 +04:00
3987fc0eeb Fixed paths 2023-11-10 11:20:02 +04:00
c134e9c7ee Client: expose pages 2023-10-31 13:18:17 +03:00
DmitrySychugov
2fc16bc9ec Merge remote-tracking branch 'remotes/origin/develop' into feature/management
# Conflicts:
#	build/build.backend.docker.ps1
#	build/build.backend.docker.sh
#	build/build.static.bat
#	build/clear.backend.docker.ps1
#	build/clear.backend.docker.sh
#	build/install/docker/Dockerfile
#	build/install/docker/Dockerfile.runtime
#	build/install/docker/config/nginx/templates/upstream.conf.template
#	build/install/docker/docspace.overcome.yml
#	build/install/docker/docspace.profiles.yml
#	build/start/start.backend.docker.ps1
#	build/start/start.backend.docker.sh
#	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
#	config/nginx/onlyoffice.conf
#	migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	package.json
#	packages/client/package.json
#	packages/client/src/pages/Confirm/sub-components/auth.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/data-management/backup/auto-backup/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/common/api/index.js
#	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 16:27:12 +05:00
Akmal Isomadinov
58e0603cda Web: Added webpack bundle analyzer 2023-09-12 18:31:31 +05:00
25102157e6 Web: Deleted SelectFolderInput. 2023-09-06 11:56:16 +03:00
2b40130bce Merge branch 'develop' into bugfix/backup 2023-09-06 10:51:25 +03:00
c6b7a33b14 Web: Deleted SelectFileInput component. 2023-09-05 16:18:04 +03:00
5730a393f0 Merge branch 'develop' into feature/management 2023-09-04 12:23:29 +04:00
969ddbe162 Web: fix Invalid Host header on WP:DevServer with domain 2023-09-04 11:13:04 +04:00
Viktor Fomin
6702ea5ebd Client: expose RestorePage 2023-08-09 14:16:45 +03:00
Viktor Fomin
af58252433 Client: expose BrandingPage, delete useless 2023-08-09 13:55:23 +03:00
Viktor Fomin
866f2c3d03 Client: expose BackupPage 2023-08-09 11:52:48 +03:00
Viktor Fomin
dd0834fb04 Client: expose NavMenu 2023-07-29 17:51:01 +03:00
Viktor Fomin
92fb3499bb Client: expose PaymentsPage 2023-07-29 14:59:16 +03:00
Viktor Fomin
47a9f7a367 Client: expose LoaderWhiteLabel 2023-07-28 01:28:32 +03:00
Viktor Fomin
c36da266ea Client: expose BreakpointWarning 2023-07-28 01:14:57 +03:00
Viktor Fomin
5da205b488 Client: add wrapper for whitelabel 2023-07-26 12:31:46 +03:00
Viktor Fomin
ac005ccda0 Client: expose CommonWhiteLabel 2023-07-24 16:58:41 +03:00
4c0e68ad3d Web:Client:FilesSelector: add available selec files 2023-06-26 15:50:49 +03:00
Timofey Boyko
a83b100f4e Web:Client: update SelectFolderDialog for editor 2023-06-22 15:59:20 +03:00
Timofey Boyko
88366b36ce Web:Client: add support type script 2023-06-09 13:24:36 +03:00
Timofey Boyko
131dd06bdb Web: fix build 2023-02-06 19:15:04 +03:00
Timofey Boyko
6137e2a122 Web: remove before-build-webpack-plugin and apply custom plugin for create autoGeneratedTranlsations files 2023-02-06 11:32:02 +03:00
Timofey Boyko
0b7b214fbb Web: change prebuild-webpack-plugin for before-build-webpack-plugin 2023-02-03 18:52:51 +03:00
961b0ad613 Merge branch 'release/rc-v1.2.0' into feature/fonts-static-versioned 2023-02-02 17:46:41 +03:00
Timofey Boyko
9f0d2b62cb Web: fix regexp for json locales 2023-02-02 17:09:26 +03:00
de95953b14 Web: Fix OS path separator split 2023-02-02 16:50:45 +03:00
Timofey Boyko
92f59e31b5 Web:Client: add asset/resource type for woff2 format and disable emit files 2023-02-02 15:12:19 +03:00
Timofey Boyko
5125fec48f Web:Client: delete console log 2023-02-02 10:05:53 +03:00
Timofey Boyko
779cd5f4c8 Web: update regexp for webpack for work with locales files as url 2023-02-01 18:49:17 +03:00
Timofey Boyko
e3ba3fe29d Web:Client:Webpack: delete useless code 2023-02-01 18:43:26 +03:00
Timofey Boyko
57d6925791 Web: update webpack configs for work with auto generated translations file 2023-02-01 18:36:43 +03:00
Timofey Boyko
2b2b8377c7 Web: add beforeBuild to all modules 2023-02-01 16:06:33 +03:00
Timofey Boyko
930b71b424 Web:Client: disable copy file with file-loader and return copy-webpack-plugin for locales 2023-02-01 11:02:32 +03:00
Timofey Boyko
bfc9ccf84a Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-01-31 17:13:48 +03:00
Timofey Boyko
ebf15af681 Web:Client: fix useless favicon from webpack 2023-01-31 13:11:19 +03:00
Timofey Boyko
fe8a1bf081 Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-01-31 12:46:43 +03:00
Timofey Boyko
68de333e2a Web: Client: remove hash for js files 2023-01-31 12:27:08 +03:00
Timofey Boyko
2ca548359a Web:Client: update webpack config for work with json files as url 2023-01-30 19:18:13 +03:00
Timofey Boyko
9e5f76d7c0 Web: fix double slash for favicon 2023-01-24 17:37:18 +03:00
Timofey Boyko
fd5423e04c Web:Client: add favicon hash with HtmlWebpackPlugin 2023-01-23 16:14:06 +03:00
Timofey Boyko
ef1d0c0184 Web: change assetModuleFilename rule 2023-01-19 15:37:15 +03:00
Timofey Boyko
5730a5e8ac Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-12 18:10:15 +03:00