From 0ecf88e51f2630ce82b1aa61dabf0eb8303870e4 Mon Sep 17 00:00:00 2001 From: Eduard Tihomirov Date: Thu, 30 Jan 2025 15:27:12 +0300 Subject: [PATCH 1/3] Merge branch 'feature/SUPPORT-8783_landing' into hotfix/1.9.8 --- config/nginx.conf | 4 ++-- frontend/index.webpack.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/nginx.conf b/config/nginx.conf index 6ea0027..511895d 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -81,7 +81,7 @@ http { index index.html; try_files $uri @index; - add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; connect-src 'self' https:; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;"; + add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; connect-src 'self' https://www.sberbank.ru; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;"; #Application config location = /src/resources/app-config.json { @@ -106,7 +106,7 @@ http { location @index { root /frontend; add_header Cache-Control "no-cache"; - add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; connect-src 'self' https:; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;"; + add_header Content-Security-Policy "frame-ancestors 'none'; default-src 'self'; connect-src 'self' https://www.sberbank.ru; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:;"; expires 0; try_files /index.html =404; } diff --git a/frontend/index.webpack.html b/frontend/index.webpack.html index 183b8d9..be59390 100644 --- a/frontend/index.webpack.html +++ b/frontend/index.webpack.html @@ -5,7 +5,7 @@ + content="default-src 'self'; connect-src 'self' https://www.sberbank.ru; script-src 'self'; style-src 'unsafe-inline' 'self' data:; font-src 'self' data:; img-src 'self' data:"/> From 5e312928965deba3d60be6b668e8076397cc68fb Mon Sep 17 00:00:00 2001 From: Zaripov Emil Date: Thu, 30 Jan 2025 16:10:39 +0300 Subject: [PATCH 2/3] set version 1.9.8 --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index fe56cdd..e380b80 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu.lkrp fl - 1.9.8-SNAPSHOT + 1.9.8 ru.micord.ervu.lkrp.fl backend diff --git a/distribution/pom.xml b/distribution/pom.xml index d36b01f..ae3bada 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu.lkrp fl - 1.9.8-SNAPSHOT + 1.9.8 ru.micord.ervu.lkrp.fl diff --git a/frontend/pom.xml b/frontend/pom.xml index ab6306a..9dcb0a5 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu.lkrp fl - 1.9.8-SNAPSHOT + 1.9.8 ru.micord.ervu.lkrp.fl diff --git a/pom.xml b/pom.xml index 7b115dd..26d9f70 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu.lkrp fl - 1.9.8-SNAPSHOT + 1.9.8 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 93285aa..5fc1987 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu.lkrp fl - 1.9.8-SNAPSHOT + 1.9.8 ru.micord.ervu.lkrp.fl From 3bb5425374f45307f3efc3d53cb410a7efe06957 Mon Sep 17 00:00:00 2001 From: Zaripov Emil Date: Fri, 31 Jan 2025 10:35:20 +0300 Subject: [PATCH 3/3] set version 1.9.4-SNAPSHOT --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index e380b80..50a8be3 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu.lkrp fl - 1.9.8 + 1.9.4-SNAPSHOT ru.micord.ervu.lkrp.fl backend diff --git a/distribution/pom.xml b/distribution/pom.xml index ae3bada..06b5df1 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu.lkrp fl - 1.9.8 + 1.9.4-SNAPSHOT ru.micord.ervu.lkrp.fl diff --git a/frontend/pom.xml b/frontend/pom.xml index 9dcb0a5..183b3c5 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu.lkrp fl - 1.9.8 + 1.9.4-SNAPSHOT ru.micord.ervu.lkrp.fl diff --git a/pom.xml b/pom.xml index 26d9f70..088bb1d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu.lkrp fl - 1.9.8 + 1.9.4-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 5fc1987..94913d8 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu.lkrp fl - 1.9.8 + 1.9.4-SNAPSHOT ru.micord.ervu.lkrp.fl