Commit graph

479 commits

Author SHA1 Message Date
Eduard Tihomirov
a6c18046c4 fix format 2024-09-26 11:25:04 +03:00
Eduard Tihomirov
ca6ea41d64 Fix 2024-09-26 11:11:00 +03:00
Халтобин Евгений
5885dfc7aa update 2024-09-26 10:45:05 +03:00
Халтобин Евгений
8e44d5fb6b Merge branch 'feature/WEBBPMNEXT-9175_migrate_to_tomcat' into feature/landing 2024-09-26 10:42:16 +03:00
Eduard Tihomirov
29e5975df5 WEBBPMNEXT-9175: Fix 2024-09-26 10:36:33 +03:00
Eduard Tihomirov
2535c6aef6 Fix esia url 2024-09-25 15:27:10 +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
Eduard Tihomirov
f114a70949 fix cookie name 2024-09-25 13:51:45 +03:00
Eduard Tihomirov
64195a3728 test 2024-09-25 13:47:55 +03:00
Халтобин Евгений
86045c5e3e sync 2024-09-25 13:42:18 +03:00
Халтобин Евгений
83280d8ef6 updated db bean 2024-09-25 13:11:54 +03:00
Халтобин Евгений
e96dcd1b4d removed spring-security-jwt 2024-09-25 13:08:06 +03:00
Халтобин Евгений
3ebc019d8e removed db beans 2024-09-25 13:07:37 +03:00
Халтобин Евгений
add1e6b61c Merge branch 'develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat 2024-09-25 12:33:16 +03:00
Халтобин Евгений
f3476faef8 Merge branch 'develop' into feature/landing 2024-09-25 08:57:25 +03:00
Zaripov Emil
373ff89503 Merge branch 'master' into develop 2024-09-24 14:27:26 +03:00
Zaripov Emil
17c30a2090 Merge branch 'release/1.0.0'
# Conflicts:
#	resources/src/main/resources/business-model/LK RP FL/mydata.page
#	resources/src/main/resources/business-model/LK RP FL/restriction.page
#	resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page
#	resources/src/main/resources/business-model/LK RP FL/subpoena.page
2024-09-24 14:26:59 +03:00
Zaripov Emil
278b96ed4b Merge branch 'release/1.0.0' into develop 2024-09-23 13:54:11 +03:00
gulnaz
7e890469e6 change esia certificate hash param name; remove some props from webbpm.properties 2024-09-23 11:35:16 +03:00
Makarova Elena
d1de15b3a4 доработка AC 2024-09-23 11:24:29 +03:00
Makarova Elena
d87fec2622 дорабока AC 2024-09-23 10:38:11 +03:00
Makarova Elena
fa73d2c374 fix ac
# Conflicts:
#	resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page
2024-09-23 10:37:44 +03:00
gulnaz
91b4343170 SUPPORT-8413: fix paths in plugin 2024-09-23 08:54:28 +03:00
gulnaz
b3e6d544fc SUPPORT-8413: revert fix version commit 2024-09-20 15:56:10 +03:00
gulnaz
dd769768ca SUPPORT-8413: fix kafka config 2024-09-20 15:54:08 +03:00
gulnaz
c99814492a SUPPORT-8413: remove duplicate from pom 2024-09-20 15:52:59 +03:00
gulnaz
f1a2bfdb47 SUPPORT-8413: refactor kafka config; rename dtos; use ervuId in requests 2024-09-20 15:48:56 +03:00
gulnaz
6b757c805c SUPPORT-8413: add topic properties 2024-09-20 15:47:06 +03:00
gulnaz
5c21958054 SUPPORT-8413: fix pages after merge 2024-09-20 14:34:07 +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
df443906d7 SUPPORT-8413: add proto plugin; remove redundant classes 2024-09-20 10:02:40 +03:00
gulnaz
2382841891 SUPPORT-8553: fix properties; add micord.env 2024-09-19 12:21:28 +03:00
Eduard Tihomirov
024ac88f23 Merge remote-tracking branch 'origin/release/1.0.0' into feature/SUPPORT-8474_id_ervu 2024-09-19 11:58:42 +03:00
Eduard Tihomirov
f08514d1a8 Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu 2024-09-19 11:58:29 +03:00
gulnaz
11c6203867 SUPPORT-8413: fix configs 2024-09-19 09:21:07 +03:00
gulnaz
ee597574d1 SUPPORT-8413: comment interaction with ReplyingKafkaTemplate; fix requests 2024-09-18 17:40:52 +03:00
Makarova Elena
5e69cead4b mydata настроила поля на подгрузку, добавила тек. дату 2024-09-17 17:57:07 +03:00
m.epshtein
055bf311fb Merge remote-tracking branch 'origin/develop' into feature/landing 2024-09-17 12:46:55 +03:00
m.epshtein
91903e136c // 2024-09-17 12:46:41 +03:00
m.epshtein
79070723cd fix hand merge 2024-09-17 12:45:12 +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
Халтобин Евгений
74a807a825 Merge branch 'develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat 2024-09-16 08:56:55 +03:00
m.epshtein
3234c84a71 header-logo 2024-09-13 15:15:36 +03:00
m.epshtein
12b263e835 fix footer 2024-09-13 15:04:25 +03:00
m.epshtein
877eee5be9 fix footer 2024-09-13 14:58:23 +03:00
Eduard Tihomirov
39927d2bf8 SUPPORT-8427: Fix 2024-09-13 10:42:45 +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
8c613a1c16 SUPPORT-8427: Fix 2024-09-13 10:37:27 +03:00