Commit graph

1038 commits

Author SHA1 Message Date
gulnaz
48d4a9d35d SUPPORT-9086: log for debug 2025-04-15 16:25:33 +03:00
gulnaz
4350976f99 SUPPORT-9086: fix jwt filter 2025-04-15 16:12:47 +03:00
gulnaz
d05d17f428 SUPPORT-9086: log for test 2025-04-15 16:09:06 +03:00
gulnaz
f7c14e39cc SUPPORT-9086: listen socket messages 2025-04-15 16:07:05 +03:00
ilyin
e47cfab95b SUPPORT-9099_3 2025-04-15 15:49:23 +03:00
Eduard Tihomirov
1dbae63971 SUPPORT-9099: Add pk 2025-04-15 15:34:55 +03:00
ilyin
ca7047bca7 Merge branch 'develop' of 10.10.31.70:ervu-account-applications into develop 2025-04-15 15:19:42 +03:00
ilyin
ffb73060fc SUPPORT-9099_2 2025-04-15 15:19:38 +03:00
gulnaz
da8aab60f7 Merge branch 'develop' into feature/SUPPORT-9104_move_app_requests_to_front 2025-04-15 15:12:40 +03:00
ilyin
50aa0e1cd9 SUPPORT-9099 2025-04-15 14:11:08 +03:00
Eduard Tihomirov
b0b31e39aa Merge branch 'feature/SUPPORT-9099_add_audit' into develop 2025-04-15 12:42:04 +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
Халтобин Евгений
4f19328c76 Merge branch 'release/1.9.11' into develop 2025-04-14 14:42:42 +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
e5af1e0f70 SUPPORT-9104: fix undefined property 2025-04-11 15:13:35 +03:00
gulnaz
3e8468399b SUPPORT-9104: fix activation 2025-04-11 14:58:35 +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
Eduard Tihomirov
6321c04908 fix pages roles
(cherry picked from commit ca06cdd1b7)
2025-04-11 10:41:36 +03:00
Eduard Tihomirov
ca06cdd1b7 fix pages roles 2025-04-11 10:37:22 +03:00
adel.kalimullin
7c3db94212 fix pages 2025-04-11 10:06:43 +03:00
adel.kalimullin
c5365e82f7 fix pages 2025-04-11 09:34:47 +03:00
Халтобин Евгений
69a2ad479f Merge branch 'release/1.9.11' into develop 2025-04-11 09:31:59 +03:00
Халтобин Евгений
f6d2daaa69 restored DropdownTreeViewComponent 2025-04-11 09:26:31 +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
Халтобин Евгений
1ccc11a49f fix 2025-04-11 09:18:14 +03:00
Халтобин Евгений
9abe6c18df merge release/1.9.11 2025-04-10 21:35:21 +03:00
Eduard Tihomirov
0ff3746d1f fix roles
(cherry picked from commit 4559afbc83)
2025-04-10 20:04:07 +03:00
Eduard Tihomirov
4559afbc83 fix roles 2025-04-10 20:02:20 +03:00
Eduard Tihomirov
39c44f0322 sync 9098 and 9105
(cherry picked from commit d0d00dab9c800a4f96c4f62e8145cbfdf3c5dfa4)
2025-04-10 19:12:12 +03:00
adel.kalimullin
558b79e03f SUPPORT-9100 sync 2025-04-10 17:39:31 +03:00
adel.kalimullin
2ee500cab2 SUPPORT-9089 sync 2025-04-10 17:37:24 +03:00
adel.kalimullin
93d26fc0da Merge branch 'feature/SUPPORT-9100_add_clear_filter' into develop 2025-04-10 17:33:22 +03:00
adel.kalimullin
8a321fbd11 Merge branch 'feature/SUPPORT-9089_fix_error_div' into develop 2025-04-10 17:31:48 +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
Халтобин Евгений
8fd5cb1480 added release notes 2025-04-10 15:59:40 +03:00
Eduard Tihomirov
eea92ab177 SUPPORT-9098: Fix 2025-04-10 15:09:23 +03:00
adel.kalimullin
441c66ad67 SUPPORT-9100: clear filter 2025-04-10 14:22:52 +03:00
adel.kalimullin
6f6e8e10f0 SUPPORT-9089: fix div error 2025-04-10 13:50:14 +03:00
adel.kalimullin
038ae4c3f1 SUPPORT-9089: fix pages 2025-04-10 12:46:35 +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
Халтобин Евгений
32b31709cf Merge remote-tracking branch 'ervu-frontend/release/ervu/1.9.11' into release/1.9.11 2025-04-09 10:45:53 +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
gulnaz
dc2409cbe6 sync 2025-04-08 20:06:05 +03:00