micord/ervu-account-applications
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
974 commits 1 branch 0 tags 87 MiB
Commit graph

287 commits

Author SHA1 Message Date
adel.ka
843b55d48a SUPPORT-9212: фиксы 2025-06-17 09:41:57 +03:00
adel.kalimullin
2c984fd5b0 SUPPORT-9213: рефактор 2025-06-11 17:12:32 +03:00
adel.kalimullin
c82249ca43 SUPPORT-9213: рефактор 2025-06-11 17:02:13 +03:00
adel.kalimullin
e8e6de4334 SUPPORT-9212: реконсиляция 2025-06-10 16:35:13 +03:00
adel.ka
5322bcc41d SUPPORT-9212: переход на idm3 реконсиляция 2025-06-07 22:46:18 +03:00
adel.ka
2013b52742 SUPPORT-9213: переход на idm3 2025-06-04 18:03:08 +03:00
adel.ka
659fa15181 SUPPORT-9089: return base FileUpload 2025-04-30 15:44:35 +03:00
gulnaz
c17979c4c7 Merge branch 'feature/SUPPORT-8987_formfield_refactor' into develop 2025-04-30 08:31:14 +03:00
gulnaz
c859f9adba SUPPORT-8952: fix page 2025-04-29 10:44:50 +03:00
gulnaz
e266bcba76 SUPPORT-8987: refactor FormField 2025-04-28 17:29:10 +03:00
gulnaz
f191dab01a SUPPORT-8952: enable EG editor on row insert 2025-04-28 13:02:08 +03:00
ilyin
0462e08cb9 Merge branch 'develop' of 10.10.31.70:ervu-account-applications into develop 2025-04-25 12:37:06 +03:00
ilyin
ce0a0c9503 SUPPORT-9142_job_position_fix 2025-04-25 12:36:25 +03:00
gulnaz
e14d71b5c1 SUPPORT-9136: update application status dynamically 2025-04-23 17:19:10 +03:00
Eduard Tihomirov
5c613ed9c3 Merge branch 'feature/SUPPORT-9129_fix_pages' into develop 2025-04-23 12:04:18 +03:00
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
acbee1f441 SUPPORT-9129: Fix 2025-04-22 14:56:47 +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
be623acf03 fix admin_role 2025-04-16 14:55:26 +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
ilyin
e47cfab95b SUPPORT-9099_3 2025-04-15 15:49:23 +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
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