Commit graph

357 commits

Author SHA1 Message Date
Eduard Tihomirov
4d26c96ead Revert "Merge branch 'develop' into feature/SUPPORT-9104_move_app_requests_to_front"
This reverts commit da8aab60f7, reversing
changes made to eecd976d53.
2025-04-16 13:06:31 +03:00
gulnaz
00265c516e Merge branch 'feature/SUPPORT-9086_listen_to_socket_msgs' into develop 2025-04-15 17:31:02 +03:00
gulnaz
4350976f99 SUPPORT-9086: fix jwt filter 2025-04-15 16:12:47 +03:00
gulnaz
f7c14e39cc SUPPORT-9086: listen socket messages 2025-04-15 16:07:05 +03:00
Eduard Tihomirov
1dbae63971 SUPPORT-9099: Add pk 2025-04-15 15:34:55 +03:00
gulnaz
da8aab60f7 Merge branch 'develop' into feature/SUPPORT-9104_move_app_requests_to_front 2025-04-15 15:12:40 +03:00
Eduard Tihomirov
de707ee81e SUPPORT-9099: Fix 2025-04-15 11:22:43 +03:00
Eduard Tihomirov
461ffd320f SUPPORT-9099: Fix 2025-04-15 10:11:28 +03:00
Eduard Tihomirov
86fdbb73dc SUPPORT-9099: Fix 2025-04-14 11:59:41 +03:00
gulnaz
eecd976d53 SUPPORT-9104: create request dtos 2025-04-11 17:21:36 +03:00
gulnaz
e3a7027350 SUPPORT-9104: remove redundant code and classes 2025-04-11 14:14:49 +03:00
gulnaz
d957d33cc7 SUPPORT-9104: move user application requests to front 2025-04-11 14:11:39 +03:00
adel.kalimullin
a4703b0d4a Merge remote-tracking branch 'origin/release/1.9.11' into develop
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java
#	backend/src/main/java/ru/micord/ervu/account_applications/service/AbstractUserDataService.java
#	backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesDaoService.java
#	resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на активацию.page
#	resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page
2025-04-11 09:19:06 +03:00
Халтобин Евгений
9abe6c18df merge release/1.9.11 2025-04-10 21:35:21 +03:00
Eduard Tihomirov
39c44f0322 sync 9098 and 9105
(cherry picked from commit d0d00dab9c800a4f96c4f62e8145cbfdf3c5dfa4)
2025-04-10 19:12:12 +03:00
adel.kalimullin
4cfa1c5a15 Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-9089_fix_error_div 2025-04-10 17:31:30 +03:00
Eduard Tihomirov
3ecf2c646f SUPPORT-9098: Fix 2025-04-10 16:00:48 +03:00
Eduard Tihomirov
eea92ab177 SUPPORT-9098: Fix 2025-04-10 15:09:23 +03:00
adel.kalimullin
38b7fb9200 SUPPORT-9089: fix error div 2025-04-10 10:55:28 +03:00
Халтобин Евгений
57f54eb98b fixed ErvuDirectoriesListener 2025-04-09 19:51:20 +03:00
gulnaz
ac93592c44 Merge branch 'feature/SUPPORT-9006_overlay_container_location' into release/1.9.11
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java
#	frontend/src/ts/account_applications/component/field/DropdownTreeViewComponent.ts
#	pom.xml
#	resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на активацию.page
#	resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page
2025-04-09 15:11:24 +03:00
Халтобин Евгений
6083a48812 Merge branch 'release/1.9.11' into develop 2025-04-09 10:08:56 +03:00
Халтобин Евгений
4f6c16b5c7 merge ervu-backend/release/ervu/1.9.11 2025-04-09 09:40:41 +03:00
Eduard Tihomirov
d33d01e966 fix 2025-04-08 19:14:47 +03:00
Eduard Tihomirov
56acb16cbf Merge branch 'feature/SUPPORT-9035_fix_grids' into develop 2025-04-08 12:57:08 +03:00
Eduard Tihomirov
11f062d8b5 SUPPORT-9080: Revert 2025-04-08 12:27:30 +03:00
Eduard Tihomirov
b60038092e Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-9080_fix_sync 2025-04-08 12:25:18 +03:00
Eduard Tihomirov
f51e42421e SUPPORT-9035: Fix 2025-04-08 12:24:35 +03:00
adel.kalimullin
7072db4812 Merge branch 'SUPPORT-8943_seamlessness' into develop 2025-04-08 10:30:15 +03:00
Eduard Tihomirov
0eed5fb268 Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-9035_fix_grids
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/account_applications/component/service/ErvuUserGridLoadService.java
#	backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentGridService.java
2025-04-08 10:27:43 +03:00
gulnaz
869f67ba6f trust all certs 2025-04-08 10:03:15 +03:00
adel.kalimullin
06ee1de54a SUPPORT-9087: fixes loading sex and snils 2025-04-07 17:04:22 +03:00
Халтобин Евгений
2807a1b2cf added logger on socket error 2025-04-07 12:05:45 +03:00
Eduard Tihomirov
845ca5e155 SUPPORT-9035: Fix 2025-04-07 12:01:28 +03:00
Eduard Tihomirov
d5e8b49c2c SUPPORT-9080: Fix 2025-04-04 17:15:25 +03:00
Eduard Tihomirov
050ba4822f SUPPORT-9035: Fix 2025-04-03 14:07:43 +03:00
Eduard Tihomirov
19fb3b5627 SUPPORT-9035: Fix 2025-04-02 13:33:10 +03:00
Eduard Tihomirov
cd069fd68b Merge branch 'feature/SUPPORT-8696_add_kafka' into SUPPORT-8943_seamlessness 2025-04-02 13:26:28 +03:00
Eduard Tihomirov
b201567745 Merge branch 'feature/SUPPORT-9035_fix_grids' into feature/SUPPORT-8696_add_kafka 2025-04-02 13:26:04 +03:00
Eduard Tihomirov
9a84f2f638 SUPPORT-9035: Fix 2025-04-02 13:02:44 +03:00
Eduard Tihomirov
82e7eb18bb SUPPORT-8696: Fix 2025-04-02 10:10:39 +03:00
Eduard Tihomirov
2c092928da SUPPORT-8696: Fix 2025-04-01 16:02:01 +03:00
Zaripov Emil
1ce2361347 set version 1.9.11 2025-04-01 13:37:10 +03:00
adel.ka
b6af9d1ec7 Merge remote-tracking branch 'origin/develop' into SUPPORT-8943_seamlessness
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/account_applications/service/AbstractUserDataService.java
2025-04-01 13:21:55 +03:00
Zaripov Emil
2887f4fc54 set version 1.9.12-SNAPSHOT 2025-04-01 13:17:55 +03:00
Zaripov Emil
c4e5a729e5 set version 1.9.12-SNAPSHOT 2025-04-01 13:16:24 +03:00
Zaripov Emil
4739aa9755 set version 1.9.11 2025-04-01 13:10:29 +03:00
Eduard Tihomirov
be8d088bb9 Merge remote-tracking branch 'origin/SUPPORT-8943_seamlessness' into feature/SUPPORT-8696_add_kafka 2025-04-01 09:56:50 +03:00
Eduard Tihomirov
0246bc2e0a SUPPORT-8696: Fix 2025-04-01 09:52:19 +03:00
Eduard Tihomirov
1efceb1b5c SUPPORT-8696: Fix 2025-03-31 16:56:08 +03:00