Eduard Tihomirov
|
39a1f753e3
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-02-03 14:05:34 +03:00 |
|
Eduard Tihomirov
|
0ecf88e51f
|
Merge branch 'feature/SUPPORT-8783_landing' into hotfix/1.9.8
|
2025-01-30 16:07:54 +03:00 |
|
Emir Suleimanov
|
ae0f27aa55
|
SUPPORT-8884: add time process the requests for access.log
|
2025-01-27 15:14:00 +03:00 |
|
Eduard Tihomirov
|
c7e5c11d26
|
Merge branch 'feature/SUPPORT-8783_landing' into hotfix/1.9.8
# Conflicts:
# config/nginx.conf
|
2025-01-27 13:42:09 +03:00 |
|
Eduard Tihomirov
|
d6542f36f2
|
SUPPORT-8783: Fix
|
2025-01-27 12:20:49 +03:00 |
|
Pavel Zilke
|
1dfa9a8ac0
|
DEVOPS-1898
|
2025-01-24 14:27:25 +03:00 |
|
Pavel Zilke
|
f1c5c1e47e
|
DEVOPS-1898
|
2025-01-24 13:56:17 +03:00 |
|
kochetkov
|
bea62ab235
|
Merge branch 'hotfix/1.9.5' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# config/nginx.conf
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-01-15 14:35:55 +03:00 |
|
Халтобин Евгений
|
c8d7ce8b0f
|
off server tokens
|
2025-01-15 13:07:19 +03:00 |
|
kochetkov
|
09916af2c4
|
some nginx conf from rtsk sources
|
2025-01-14 10:01:17 +03:00 |
|
kochetkov
|
df562fe38f
|
add patched server.xml from ul
|
2025-01-13 12:18:36 +03:00 |
|
Eduard Tihomirov
|
90ec38852f
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ru/micord/ervu/controller/ErvuDataController.java
# backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaTokensStore.java
# backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
# config/nginx.conf
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-01-10 13:15:15 +03:00 |
|
kochetkov
|
2d2a07bb0c
|
SUPPORT-8830 fix logout
|
2024-12-27 13:05:33 +03:00 |
|
Халтобин Евгений
|
65872ef7da
|
DEVOPS-1892: added cache settings
|
2024-12-24 14:28:30 +03:00 |
|
Халтобин Евгений
|
1b98944498
|
DEVOPS-1892: added cache settings
moved from angie to nginx
|
2024-12-23 10:18:03 +03:00 |
|
Халтобин Евгений
|
b8c78bfe68
|
DEVOPS-1892: added cache settings
moved from angie to nginx
|
2024-12-23 10:17:03 +03:00 |
|
Халтобин Евгений
|
532822c60f
|
updated
|
2024-12-18 21:12:39 +03:00 |
|
Халтобин Евгений
|
76aba32d64
|
added docker compose
|
2024-12-05 09:04:17 +03:00 |
|
Eduard Tihomirov
|
c4e5bab8b6
|
fix marker verify
(cherry picked from commit f46ddfc623589bdadcafabfce77a18d8d4f569f0)
|
2024-11-26 16:20:10 +03:00 |
|
Eduard Tihomirov
|
b6072d9bf4
|
Merge branch 'develop' into feature/SUPPORT-8593_marker_verify
|
2024-11-26 16:19:56 +03:00 |
|
Zaripov Emil
|
cd60dded99
|
set DB_APP_NAME=ervu_lkrp_fl
|
2024-11-08 15:16:33 +03:00 |
|
gulnaz
|
5808a3e10a
|
SUPPORT-8664: fix NPE, config and kafka template bean name
|
2024-10-31 13:53:44 +03:00 |
|
Eduard Tihomirov
|
bb29b09aee
|
Merge branch 'master' into feature/SUPPORT-8593_marker_verify
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaPersonalDataService.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/PersonalDataService.java
# config/standalone/dev/standalone.xml
|
2024-10-25 15:12:11 +03:00 |
|
Халтобин Евгений
|
080be303bd
|
fix
|
2024-10-24 10:16:24 +03:00 |
|
Eduard Tihomirov
|
4a57d604db
|
Merge remote-tracking branch 'origin/release/1.8' into feature/SUPPORT-8579_access_marker
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java
# backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
|
2024-10-23 12:06:24 +03:00 |
|
gulnaz
|
641b2617b3
|
move changes to release
|
2024-10-19 12:38:32 +03:00 |
|
Халтобин Евгений
|
4b9c618eb2
|
fixed kafka parameter
|
2024-10-19 08:44:26 +03:00 |
|
Eduard Tihomirov
|
47069acb2b
|
SUPPORT-8593: Fix
|
2024-10-09 08:03:41 +03:00 |
|
Eduard Tihomirov
|
d5082c3ce2
|
SUPPORT-8579: Fix
|
2024-10-03 16:28:43 +03:00 |
|
Pavel Zilke
|
005af5a9e6
|
delete unused env variables
|
2024-09-27 10:41:48 +03:00 |
|
Халтобин Евгений
|
ee4d64bc71
|
added props
|
2024-09-25 15:07:45 +03:00 |
|
Халтобин Евгений
|
c31af0f366
|
added ERVU_KAFKA_SECURITY_PROTOCOL
|
2024-09-25 14:48:40 +03:00 |
|
Халтобин Евгений
|
86045c5e3e
|
sync
|
2024-09-25 13:42:18 +03:00 |
|
Халтобин Евгений
|
add1e6b61c
|
Merge branch 'develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat
|
2024-09-25 12:33:16 +03:00 |
|
gulnaz
|
7e890469e6
|
change esia certificate hash param name; remove some props from webbpm.properties
|
2024-09-23 11:35:16 +03:00 |
|
gulnaz
|
6b757c805c
|
SUPPORT-8413: add topic properties
|
2024-09-20 15:47:06 +03:00 |
|
gulnaz
|
5030679eb9
|
Merge branch 'release/1.0.0' into feature/SUPPORT-8412-8413_new_request_format
# Conflicts:
# backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
# config/patches/default.cli
# config/standalone/dev/standalone.xml
# frontend/src/ts/modules/app/app.module.ts
# pom.xml
# resources/src/main/resources/business-model/LK RP FL/mydata.page
# resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page
|
2024-09-20 10:51:43 +03:00 |
|
gulnaz
|
2382841891
|
SUPPORT-8553: fix properties; add micord.env
|
2024-09-19 12:21:28 +03:00 |
|
Халтобин Евгений
|
a3765ff7e7
|
restored standalone.xml
|
2024-09-16 10:39:12 +03:00 |
|
Халтобин Евгений
|
d1b7bc8daa
|
updated docker
|
2024-09-16 10:14:19 +03:00 |
|
Eduard Tihomirov
|
59233df325
|
Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
|
2024-09-13 10:41:36 +03:00 |
|
Eduard Tihomirov
|
56b166e9a6
|
SUPPORT-8427: Fix
|
2024-09-12 16:41:20 +03:00 |
|
Eduard Tihomirov
|
679ddea997
|
SUPPORT-8474: Fix
|
2024-09-12 15:34:26 +03:00 |
|
Eduard Tihomirov
|
3c0b7bc0e8
|
SUPPORT-8474: Fix
|
2024-09-12 15:11:08 +03:00 |
|
Eduard Tihomirov
|
8c85539124
|
SUPPORT-8427: Fix
|
2024-09-12 14:51:39 +03:00 |
|
gulnaz
|
fef88756e6
|
SUPPORT-8413: move classes to another package; remove redundant scripts
|
2024-09-11 15:30:58 +03:00 |
|
gulnaz
|
95cc5d21d8
|
Merge branch 'develop' into feature/SUPPORT-8412-8413_new_request_format
# Conflicts:
# backend/src/main/java/ervu_lkrp_fl/ervu_lkrp_fl/controller/ProfileController.java
# config/patches/default.cli
# frontend/src/ts/modules/app/app.module.ts
# frontend/src/ts/modules/app/component/app-header.component.ts
# frontend/src/ts/modules/app/service/app-jivo-chat.service.ts
# resources/src/main/resources/business-model/LK RP FL/restriction.page
|
2024-09-10 10:59:50 +03:00 |
|
Eduard Tihomirov
|
9168a8a023
|
SUPPORT-8474: Fix
|
2024-09-09 10:34:37 +03:00 |
|
Eduard Tihomirov
|
704ea8d376
|
SUPPORT-8427: Fix
|
2024-09-06 13:52:55 +03:00 |
|
Eduard Tihomirov
|
4e5355566d
|
SUPPORT-8427: Fix
|
2024-09-06 10:28:56 +03:00 |
|