Commit graph

1038 commits

Author SHA1 Message Date
gulnaz
be5d95f3e9 sync 2025-04-08 20:03:42 +03:00
adel.kalimullin
c29bcdee84 sync SUPPORT-9087 2025-04-08 19:41:00 +03:00
Eduard Tihomirov
d33d01e966 fix 2025-04-08 19:14:47 +03:00
Eduard Tihomirov
3f0fb361ec fix 2025-04-08 19:11:31 +03:00
Eduard Tihomirov
1ebc3ca2b0 sync from backend 2025-04-08 18:39:35 +03:00
gulnaz
5bb7123b9c sync 2025-04-08 18:03:15 +03:00
adel.kalimullin
773a990764 sync SUPPORT-9090 2025-04-08 18:03:13 +03:00
gulnaz
5394e7b5ee sync 9035 and 9080
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/account_applications/component/service/RecruitmentGridService.java
2025-04-08 18:03:01 +03:00
adel.kalimullin
0f560ab5c9 Merge branch 'feature/SUPPORT-9090_edit_login' into develop 2025-04-08 13:25:15 +03:00
Eduard Tihomirov
56acb16cbf Merge branch 'feature/SUPPORT-9035_fix_grids' into develop 2025-04-08 12:57:08 +03:00
adel.kalimullin
e22d736668 SUPPORT-9090: fix login 2025-04-08 12:45:24 +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
3024bff006 Merge branch 'feature/SUPPORT-9087_fix_loading' into SUPPORT-8943_seamlessness 2025-04-08 09:42:24 +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
Zaripov Emil
e4b2e0d92e Merge branch 'SUPPORT-8943_seamlessness' into develop 2025-04-04 14:24:25 +03:00
Eduard Tihomirov
050ba4822f SUPPORT-9035: Fix 2025-04-03 14:07:43 +03:00
gulnaz
c0b147d3b6 SUPPORT-9060: up base package and platform version 2025-04-02 15:11:18 +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
0a19f0dbd1 Merge branch 'develop' into SUPPORT-8943_seamlessness 2025-04-01 13:40:46 +03:00
Zaripov Emil
a36f8566bc Merge branch 'master' into develop
# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-04-01 13:39:12 +03:00
Zaripov Emil
1ce2361347 set version 1.9.11 2025-04-01 13:37:10 +03:00
Zaripov Emil
bfaa3d117a Merge branch 'origin/hotfix/1.9.11'
# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-04-01 13:36:10 +03:00
Zaripov Emil
5135348a15 set version 1.9.9 2025-04-01 13:33:20 +03:00
Zaripov Emil
4df9c6270a Merge branch 'hotfix/1.9.9' 2025-04-01 13:32:29 +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
a8c0a2847d Merge branch 'master' into develop 2025-04-01 13:13:33 +03:00
Zaripov Emil
4739aa9755 set version 1.9.11 2025-04-01 13:10:29 +03:00
Zaripov Emil
5bdd36ec2e Merge branch 'origin/hotfix/1.9.11' 2025-04-01 13:07: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
adel.ka
67a40528b4 use idm url 2025-03-31 15:36:31 +03:00
adel.ka
0caca90dda use idm 2025-03-31 15:31:21 +03:00
adel.ka
596d0dd8cb use idm 2025-03-31 15:27:02 +03:00
Eduard Tihomirov
6639021e39 SUPPORT-8696: Fix 2025-03-31 14:42:51 +03:00