gulnaz
|
4a9b2f08c2
|
SUPPORT-9136: fix queries
|
2025-04-24 17:47:17 +03:00 |
|
gulnaz
|
e14d71b5c1
|
SUPPORT-9136: update application status dynamically
|
2025-04-23 17:19:10 +03:00 |
|
Eduard Tihomirov
|
d1716cd9c8
|
fix
|
2025-04-22 12:48:14 +03:00 |
|
Eduard Tihomirov
|
bafe64e6af
|
Revert "Merge remote-tracking branch 'origin/release/1.9.12' into develop"
This reverts commit dfb6c493b1, reversing
changes made to 71aa1a8bda.
|
2025-04-21 15:44:30 +03:00 |
|
Zaripov Emil
|
3ab42d4e1d
|
set version 1.10.0-SNAPSHOT
|
2025-04-21 14:35:08 +03:00 |
|
gulnaz
|
dfb6c493b1
|
Merge remote-tracking branch 'origin/release/1.9.12' into develop
# Conflicts:
# backend/src/main/java/ru/micord/ervu/account_applications/component/service/AuditFormDaoImpl.java
# backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/UserApplicationListAudit.java
# backend/src/main/java/ru/micord/ervu/account_applications/db_beans/public_/tables/records/UserApplicationListAuditRecord.java
# backend/src/main/resources/config/v_1.0/changelog-1.0.xml
# resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page
# resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на изменение пользователя.page
|
2025-04-21 14:23:09 +03:00 |
|
Eduard Tihomirov
|
e4dc36cb59
|
Merge branch 'feature/SUPPORT-9115_fix_directories' into develop
|
2025-04-21 13:13:43 +03:00 |
|
Eduard Tihomirov
|
5bfee385bb
|
SUPPORT-9115: Fix
|
2025-04-21 10:57:06 +03:00 |
|
Eduard Tihomirov
|
94ffdd1f78
|
SUPPORT-9115: Fix
|
2025-04-21 10:14:00 +03:00 |
|
Eduard Tihomirov
|
1580b65fc2
|
SUPPORT-9115: Fix
|
2025-04-18 16:12:30 +03:00 |
|
Eduard Tihomirov
|
9a3e6565cc
|
Revert "SUPPORT-9115: Fix"
This reverts commit fe1b79202c.
|
2025-04-18 15:50:03 +03:00 |
|
Eduard Tihomirov
|
e234355e24
|
Revert "SUPPORT-9115: Fix"
This reverts commit 3eaae2336c.
|
2025-04-18 15:49:54 +03:00 |
|
adel.kalimullin
|
69dbb5ae42
|
SUPPORT-9123 sync
|
2025-04-18 13:32:04 +03:00 |
|
Eduard Tihomirov
|
3eaae2336c
|
SUPPORT-9115: Fix
|
2025-04-18 13:26:34 +03:00 |
|
adel.kalimullin
|
204464bde2
|
SUPPORT-9123:fix remove-roles
|
2025-04-18 11:36:36 +03:00 |
|
Eduard Tihomirov
|
fe1b79202c
|
SUPPORT-9115: Fix
|
2025-04-18 10:59:41 +03:00 |
|
Eduard Tihomirov
|
a05422dc94
|
SUPPORT-9115: Fix
|
2025-04-18 10:27:47 +03:00 |
|
Eduard Tihomirov
|
9d52630d44
|
SUPPORT-9115: Fix
|
2025-04-17 12:04:00 +03:00 |
|
Eduard Tihomirov
|
04a5937d99
|
SUPPORT-9115: Fix
|
2025-04-17 10:50:42 +03:00 |
|
Eduard Tihomirov
|
1d97152772
|
SUPPORT-9115: Fix
|
2025-04-17 10:15:42 +03:00 |
|
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 |
|