Commit graph

237 commits

Author SHA1 Message Date
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
Халтобин Евгений
4f6c16b5c7 merge ervu-backend/release/ervu/1.9.11 2025-04-09 09:40:41 +03:00
Eduard Tihomirov
f51e42421e SUPPORT-9035: Fix 2025-04-08 12:24:35 +03:00
gulnaz
c0b147d3b6 SUPPORT-9060: up base package and platform version 2025-04-02 15:11:18 +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
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
Eduard Tihomirov
6c89fef6f7 Merge branch 'feature/SUPPORT-8696_add_kafka' into SUPPORT-8943_seamlessness
# Conflicts:
#	pom.xml
2025-03-28 15:06:10 +03:00
gulnaz
368c371b7c SUPPORT-9006: fix overlay container location 2025-03-27 17:18:06 +03:00
Zaripov Emil
536c85c1bb Merge remote-tracking branch 'origin/test/ERVU-342' into SUPPORT-8943_seamlessness 2025-03-27 12:46:47 +03:00
Zaripov Emil
c8aa2b8b08 set version 1.9.11-SNAPSHOT 2025-03-27 09:17:42 +03:00
adel.ka
7d9d2971b8 SUPPORT-9040: edit setValue in DropdownTreeViewComponent 2025-03-26 14:59:37 +03:00
gulnaz
07e7dbd8a4 Merge branch 'feature/SUPPORT-9038_activation' into test/ERVU-342 2025-03-25 15:37:45 +03:00
gulnaz
fb635c6b8f SUPPORT-9038: add account activation endpoint 2025-03-25 14:53:06 +03:00
Makarova Elena
511ac3369e app-routing.module.ts 2025-03-25 12:57:50 +03:00
Emir Suleimanov
c6b73adb19 Merge branch 'refs/heads/feature/SUPPORT-9003_inputmask' into SUPPORT-8943_seamlessness 2025-03-25 11:58:05 +03:00
Emir Suleimanov
9977b48730 SUPPORT-9003: update platform to 3.192.5 2025-03-25 11:39:51 +03:00
gulnaz
06ebc0b667 SUPPORT-9037: fix rejection 2025-03-24 17:51:41 +03:00
Makarova Elena
50712015ea fix by sergei 2025-03-24 15:09:32 +03:00
kochetkov
0042bb4460 SUPPORT-9030 update platform to 3.192.4 2025-03-24 12:56:55 +03:00
adel.kalimullin
ef3f802bc9 Merge branch 'feature/SUPPORT-9004_fix_font' into SUPPORT-8943_seamlessness 2025-03-20 14:11:32 +03:00
adel.kalimullin
a8fb4d33bf SUPPORT-9004: fix loading font agGridBalham 2025-03-20 12:41:22 +03:00
Emir Suleimanov
301a5a7e9d SUPPORT-9003: update inputmask version for test 2025-03-20 10:18:45 +03:00
adel.kalimullin
e2876cbefe SUPPORT-9011: change to method-Ac 2025-03-18 11:57:53 +03:00
adel.kalimullin
48af88a709 SUPPORT-9011: fixes 2025-03-18 10:12:59 +03:00
adel.kalimullin
429ca3379d SUPPORT-9011: transferData 2025-03-18 10:07:36 +03:00
ilyin
f51a9109c3 fix_navigation 2025-03-17 22:16:53 +03:00
gulnaz
18ac355a31 SUPPORT-8957: fix deactivation and mapping 2025-03-17 14:34:06 +03:00
adel.kalimullin
527e0d447f Merge branch 'feature/SUPPORT-9011_fix_load' into SUPPORT-8943_seamlessness 2025-03-17 13:52:15 +03:00
adel.kalimullin
455f48a270 SUPPORT-9011: fixes 2025-03-17 12:08:25 +03:00
gulnaz
9f9c52d2d8 SUPPORT-9012: fix user management service and page 2025-03-17 11:11:43 +03:00
Zaripov Emil
a0b306d280 Merge remote-tracking branch 'origin/feature/SUPPORT-8957_add_set_account_action_method' into SUPPORT-8943_seamlessness 2025-03-16 16:20:12 +03:00
Alexandr Shalaginov
7d306cdafe SUPPORT-8957: change to string param 2025-03-16 15:47:03 +03:00
adel.ka
0b9b91612f SUPPORT-9011: fix loading ip and roles 2025-03-16 11:59:25 +03:00
Alexandr Shalaginov
3e7764fcfe Merge remote-tracking branch 'origin/SUPPORT-8943_seamlessness' into feature/SUPPORT-8957_add_set_account_action_method 2025-03-15 21:23:50 +03:00
Alexandr Shalaginov
f918d2ee0b SUPPORT-8957: add method 2025-03-15 20:05:48 +03:00
adel.ka
51ce245e97 Merge remote-tracking branch 'origin/SUPPORT-8943_seamlessness' into feature/SUPPORT-9001_pass_reset
# Conflicts:
#	frontend/src/ts/account_applications/component/button/UserManagementService.ts
#	frontend/src/ts/account_applications/component/enum/AccountAction.ts
2025-03-14 16:05:14 +03:00
gulnaz
07cedf50c7 SUPPORT-8957: fix account action 2025-03-14 13:51:48 +03:00
adel.ka
80cd9ef064 SUPPORT-9001: remove ugly 2025-03-14 13:26:20 +03:00
adel.ka
f769a34da1 Merge remote-tracking branch 'origin/SUPPORT-8943_seamlessness' into feature/SUPPORT-9001_pass_reset
# Conflicts:
#	backend/src/main/resources/config/v_1.0/changelog-1.0.xml
#	frontend/src/ts/account_applications/component/enum/AccountAction.ts
2025-03-14 12:46:32 +03:00
adel.ka
61763402e4 SUPPORT-9001: refactor 2025-03-14 12:41:23 +03:00
adel.ka
c9817c5723 SUPPORT-9001: refactor 2025-03-14 12:39:55 +03:00
adel.ka
a1e3797486 SUPPORT-9001: reset-pass 2025-03-14 10:05:03 +03:00
Emir Suleimanov
99da820694 SUPPORT-8999: refactor code 2025-03-13 20:18:51 +03:00
Emir Suleimanov
6eaccd17dc SUPPORT-8999: credential edit 2025-03-13 17:47:07 +03:00
ilyin
7928bc9b0e ERVU-321_edit_user 2025-03-13 12:08:30 +03:00
Emir Suleimanov
bdb112c211 Merge branch 'refs/heads/feature/SUPPORT-8971_validation' into SUPPORT-8943_seamlessness 2025-03-12 15:00:06 +03:00