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
|
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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
adel.kalimullin
|
e22d736668
|
SUPPORT-9090: fix login
|
2025-04-08 12:45:24 +03:00 |
|
adel.kalimullin
|
06ee1de54a
|
SUPPORT-9087: fixes loading sex and snils
|
2025-04-07 17:04:22 +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 |
|
ilyin
|
566bd364ad
|
fix
|
2025-03-31 10:29:57 +03:00 |
|
adel.ka
|
773a0dfd9a
|
fix
|
2025-03-28 15:21: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 |
|
ilyin
|
b67208fccd
|
ERVU-361
|
2025-03-28 14:57:25 +03:00 |
|
ilyin
|
4619ab813c
|
ERVU-361_visual_grid_fix
|
2025-03-28 14:39:00 +03:00 |
|
ilyin
|
190d26b67e
|
UNBLOCK_USER_filter
|
2025-03-28 13:48:36 +03:00 |
|
ilyin
|
7ade5d2d04
|
ERVU-361
|
2025-03-28 10:08:34 +03:00 |
|
adel.ka
|
035a8a2ad6
|
fix
|
2025-03-27 19:54:46 +03:00 |
|
Zaripov Emil
|
c8aa2b8b08
|
set version 1.9.11-SNAPSHOT
|
2025-03-27 09:17:42 +03:00 |
|
Makarova Elena
|
a08fd72d1b
|
ERVU-342 добавила заявку на активацию, добавила кнопку активации в списке заявок, добавила фильтр в подгрузке списка пользователей актиен/неактивен
|
2025-03-25 12:23:52 +03:00 |
|
gulnaz
|
06ebc0b667
|
SUPPORT-9037: fix rejection
|
2025-03-24 17:51:41 +03:00 |
|
Makarova Elena
|
db89ec8861
|
ERVU-342 обязательность документа
|
2025-03-24 15:17:35 +03:00 |
|
adel.ka
|
b7e59faa06
|
Merge remote-tracking branch 'refs/remotes/origin/feature/SUPPORT-9002_encode_pass' into SUPPORT-8943_seamlessness
|
2025-03-24 10:58:00 +03:00 |
|
Makarova Elena
|
374698ba75
|
отступы в учетных данных и ролях, документ в строку перенесла
|
2025-03-21 14:57:41 +03:00 |
|
Makarova Elena
|
d02a4b2642
|
ERVU-342 4 замечания fix
|
2025-03-21 13:02:10 +03:00 |
|
adel.kalimullin
|
339c3dc76d
|
SUPPORT-9002: fixes
|
2025-03-20 16:50:35 +03:00 |
|