Commit graph

822 commits

Author SHA1 Message Date
ilyin
fee4ad24d6 margin_button 2025-04-23 09:56:45 +03:00
ilyin
e80cf3d0c6 SUPPORT-9141 2025-04-22 17:22:52 +03:00
ilyin
99e001f13b UPPORT-9099 2025-04-22 16:59:27 +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
adel.ka
71aa1a8bda Merge remote-tracking branch 'origin/feature/SUPPORT-9116_clear_tree' into develop 2025-04-21 13:24:05 +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
101a9142dc Merge remote-tracking branch 'origin/feature/SUPPORT-9123_fix_remove_roles' into develop 2025-04-18 15:34:49 +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
be623acf03 fix admin_role 2025-04-16 14:55:26 +03:00
adel.kalimullin
0615b6daea SUPPORT-9116:refactor 2025-04-16 14:20:14 +03:00
adel.kalimullin
ee00841021 SUPPORT-9116:add clear org from tree 2025-04-16 14:17:20 +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
555898da68 Merge branch 'feature/SUPPORT-9086_listen_to_socket_msgs' into develop 2025-04-15 18:02:49 +03:00
gulnaz
568a1fecdc SUPPORT-9086: remove logging 2025-04-15 18:02:30 +03:00
gulnaz
cec2285894 SUPPORT-9086: fix status saving 2025-04-15 18:01:57 +03:00
gulnaz
00265c516e Merge branch 'feature/SUPPORT-9086_listen_to_socket_msgs' into develop 2025-04-15 17:31:02 +03:00
gulnaz
7b748d8a84 SUPPORT-9086: remove test code 2025-04-15 16:52:57 +03:00
gulnaz
b758b57a82 SUPPORT-9086: log for debug 2 2025-04-15 16:40:12 +03:00
gulnaz
fed099caf3 SUPPORT-9086: fix for debug 2025-04-15 16:26:36 +03:00
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