Commit graph

389 commits

Author SHA1 Message Date
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
Makarova Elena
7e6693fa9c добавила доп. поле 2024-09-12 18:07:25 +03:00
Makarova Elena
a80d319ece доработка контроллера вызова диалога 2024-09-12 16:43:06 +03:00
Eduard Tihomirov
56b166e9a6 SUPPORT-8427: Fix 2024-09-12 16:41:20 +03:00
Makarova Elena
d98d4d26c5 Merge remote-tracking branch 'origin/feature/SUPPORT-8412-8413_new_request_format' into feature/SUPPORT-8412-8413_new_request_format 2024-09-12 16:25:56 +03:00
gulnaz
1d17af1471 SUPPORT-8413: replace various prefix text formatter with ts script; fix pages 2024-09-12 16:16:49 +03:00
Makarova Elena
785c88fbb9 Merge remote-tracking branch 'origin/feature/SUPPORT-8412-8413_new_request_format' into feature/SUPPORT-8412-8413_new_request_format 2024-09-12 16:06:08 +03:00
gulnaz
1c9236460a SUPPORT-8413: replace various suffix text formatter with ts script; fix pages 2024-09-12 16:00:37 +03:00
Eduard Tihomirov
679ddea997 SUPPORT-8474: Fix 2024-09-12 15:34:26 +03:00
Makarova Elena
87ca9879a0 настроила AC на вызов диалога, видимость блоков 2024-09-12 15:13:49 +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
Eduard Tihomirov
eb889c7b64 SUPPORT-8427: Fix 2024-09-12 14:45:26 +03:00
Eduard Tihomirov
d85ca0fd0c SUPPORT-8427: Fix 2024-09-12 10:58:12 +03:00
Eduard Tihomirov
9fd2d353f0 SUPPORT-8427: Fix 2024-09-11 16:08:49 +03:00
gulnaz
4fc0022c71 SUPPORT-8413: change request 2024-09-11 15:40:51 +03:00
gulnaz
2028d99da2 SUPPORT-8413: add TODO 2024-09-11 15:31:30 +03:00
gulnaz
fef88756e6 SUPPORT-8413: move classes to another package; remove redundant scripts 2024-09-11 15:30:58 +03:00
Eduard Tihomirov
1cb8b4498f SUPPORT-8427: Fix 2024-09-11 10:18:47 +03:00
Eduard Tihomirov
c7003ad3d0 SUPPORT-8427: Fix 2024-09-11 10:11:39 +03:00
gulnaz
13a0c9e93f SUPPORT-8413: change form service parent 2024-09-10 17:34:06 +03:00
gulnaz
d96d9e6e44 SUPPORT-8413: remove jivo 2024-09-10 12:36:35 +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
0ecfa00e8a SUPPORT-8474: Add kafka 2024-09-08 12:34:02 +03:00
Eduard Tihomirov
b89b4a70c3 SUPPORT-8427: Fix 2024-09-06 16:18:52 +03:00
Eduard Tihomirov
bcf9721224 SUPPORT-8427: Fix 2024-09-06 14:21:52 +03:00
Eduard Tihomirov
704ea8d376 SUPPORT-8427: Fix 2024-09-06 13:52:55 +03:00
kochetkov
ced6aea94d fix 2024-09-06 11:04:48 +03:00
Eduard Tihomirov
4e5355566d SUPPORT-8427: Fix 2024-09-06 10:28:56 +03:00
Eduard Tihomirov
7cb5b80281 SUPPORT-8427: Fix 2024-09-06 10:23:01 +03:00
Eduard Tihomirov
737a9866c1 SUPPORT-8427: Fix 2024-09-05 17:18:57 +03:00
Eduard Tihomirov
4ff0dd8ec7 SUPPORT-8427: Fix 2024-09-05 15:59:22 +03:00
Eduard Tihomirov
e67d0fde94 SUPPORT-8427: Fix 2024-09-05 14:44:21 +03:00
Eduard Tihomirov
d4faf96938 SUPPORT-8427: Fix 2024-09-05 13:55:58 +03:00
Eduard Tihomirov
132a39fa51 Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8427_new 2024-09-05 13:44:50 +03:00
Eduard Tihomirov
723e6edfef SUPPORT-8427: Fix 2024-09-05 13:39:39 +03:00
Eduard Tihomirov
60464b29c5 SUPPORT-8427: Add security and logout 2024-09-05 13:30:45 +03:00
Eduard Tihomirov
bcb73f198a SUPPORT-8427: Fix 2024-09-04 11:45:04 +03:00
Eduard Tihomirov
322ad29571 SUPPORT-8427: Fix 2024-09-04 11:06:55 +03:00
Eduard Tihomirov
812d94683f SUPPORT-8427: Fix 2024-09-04 10:35:24 +03:00