Commit graph

1523 commits

Author SHA1 Message Date
Eduard Tihomiorv
fc747df12a SUPPORT-9509: Fix 2025-10-28 10:49:38 +03:00
Eduard Tihomiorv
56a682bdeb Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-9509_fix_mchd 2025-10-28 10:43:40 +03:00
Eduard Tihomiorv
d756543745 SUPPORT-9509: Fix 2025-10-28 10:42:18 +03:00
adel.ka
62e3a68553 Merge remote-tracking branch 'origin/feature/SUPPORT-9513_fix_set_filter' into develop 2025-10-27 15:30:30 +03:00
Eduard Tihomiorv
47e44facb8 Merge branch 'develop' into feature/SUPPORT-9509_fix_mchd 2025-10-27 15:16:07 +03:00
adel.ka
306e8377c9 SUPPORT-9513: фикс фильтра множества 2025-10-27 11:12:34 +03:00
adel.ka
f992dfb120 Merge remote-tracking branch 'origin/feature/SUPPORT-9497' into develop
# Conflicts:
#	backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Keys.java
#	backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Public.java
#	backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/Tables.java
#	backend/src/main/resources/config/v_1.0/changelog-v_1.0.xml
2025-10-27 10:58:09 +03:00
Eduard Tihomiorv
e345e2a92f Merge branch 'feature/SUPPORT-9484_fix_date' into develop 2025-10-24 15:27:20 +03:00
Eduard Tihomiorv
4590a6f975 SUPPORT-9509: Fix mchd 2025-10-24 15:26:12 +03:00
adel.ka
ef451c2f58 SUPPORT-9497: fix from review 2025-10-24 12:41:55 +03:00
adel.ka
417d8d05dd SUPPORT-9497: fix from review 2025-10-24 12:38:18 +03:00
adel.ka
d9c9c76781 SUPPORT-9497: добавил инфу в config.md 2025-10-24 11:57:29 +03:00
adel.ka
f2788e1d5e SUPPORT-9497: refactor 2025-10-24 11:52:18 +03:00
adel.ka
30ae19cb94 SUPPORT-9497: fixes 2025-10-24 11:49:34 +03:00
adel.ka
8b80fef58a SUPPORT-9497: fixes 2025-10-24 11:47:33 +03:00
adel.ka
4bd2c7787e SUPPORT-9497: fix 2025-10-24 11:46:04 +03:00
Zaripov Emil
1f0c337152 ERVU-15726 2025-10-24 10:51:43 +03:00
adel.ka
3d5e548b2b SUPPORT-9497: ogrn check 2025-10-24 09:34:24 +03:00
Eduard Tihomiorv
737e126f39 SUPPORT-9484: Fix 2025-10-22 16:54:49 +03:00
Zaripov Emil
05831ed717 https://jira.rtsk.loc/browse/ERVU-15615 2025-10-21 13:34:05 +03:00
Eduard Tihomiorv
3e93d50d1e SUPPORT-9484: Delete zoneformatter 2025-10-20 19:20:48 +03:00
Eduard Tihomiorv
302a0798a3 SUPPORT-9484: Fix 2025-10-20 19:19:55 +03:00
Eduard Tihomiorv
11d9eb2afd SUPPORT-9484: Fix 2025-10-20 16:58:54 +03:00
Eduard Tihomiorv
c38fb71b9b SUPPORT-9484: fix 2025-10-20 13:00:19 +03:00
adel.ka
67001a31d8 Merge remote-tracking branch 'origin/develop' into develop 2025-10-20 11:28:03 +03:00
adel.ka
0f077ba592 фикс 2025-10-20 11:27:44 +03:00
Zaripov Emil
cd77fb6ba7 ERVU-594 2025-10-20 11:00:29 +03:00
adel.ka
e7c983f70a Merge branch 'feature/SUPPORT-9368_journal_new_version' into develop 2025-10-20 10:49:00 +03:00
adel.ka
1b0fb3e1bb Merge remote-tracking branch 'origin/feature/SUPPORT-9339_add_sign_verify' into feature/SUPPORT-9368_journal_new_version
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/journal/JournalDto.java
#	backend/src/main/java/ru/micord/ervu/journal/JournalFileInfo.java
#	backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java
#	resources/src/main/resources/business-model/Журнал взаимодействия.page
2025-10-20 10:45:39 +03:00
adel.ka
49385d5766 SUPPORT-9368: рефактор 2025-10-20 09:02:35 +03:00
adel.ka
e74ecab7e5 SUPPORT-9368: добавил инфу для аудита 2025-10-19 04:36:15 +03:00
Zaripov Emil
5b36227437 ERVU-587 2025-10-17 20:58:30 +03:00
Zaripov Emil
6fac9be527 ERVU-587 2025-10-17 20:58:03 +03:00
adel.ka
a7556b0af5 SUPPORT-9368: proto file 2025-10-17 17:47:11 +03:00
adel.ka
fbd25050f0 SUPPORT-9368: поменял сортировку 2025-10-17 16:33:47 +03:00
adel.ka
87c3e905f3 SUPPORT-9368: фикс 2025-10-17 14:44:45 +03:00
adel.ka
ada7f3398c SUPPORT-9368: убрал запись об ошибке в validateFileService 2025-10-17 14:16:02 +03:00
adel.ka
6af3c7e4b1 SUPPORT-9368: css 2025-10-17 11:07:36 +03:00
Eduard Tihomiorv
ceb6a6ee43 fix status packInfo 2025-10-17 09:54:58 +03:00
Eduard Tihomiorv
2118f96c26 SUPPORT-9339: Fix status 2025-10-16 16:07:10 +03:00
Eduard Tihomiorv
19c3b69aa9 fix 2025-10-16 15:29:47 +03:00
Eduard Tihomiorv
9a9ff4930f fix text 2025-10-16 14:57:23 +03:00
adel.ka
f27bbe58b0 SUPPORT-9368: ФИКС 2025-10-16 13:48:42 +03:00
adel.ka
a63b20b119 SUPPORT-9368: поменял переменные 2025-10-16 13:16:53 +03:00
adel.ka
3316cac258 SUPPORT-9368: fix from review 2025-10-16 11:11:40 +03:00
Eduard Tihomiorv
a6640abe02 Merge branch 'feature/SUPPORT-9339_add_sign_verify' of 10.10.31.70:/ervu-lkrp-ul into feature/SUPPORT-9339_add_sign_verify 2025-10-15 16:36:52 +03:00
Eduard Tihomiorv
20bee06813 form 12 2025-10-15 16:29:36 +03:00
adel.ka
33c0a42517 Для команды Соловьева fix 2025-10-15 16:15:55 +03:00
adel.ka
64cc5ff7a9 Для команды Соловьева 2025-10-15 16:14:52 +03:00
Eduard Tihomiorv
3fe3ef6921 form 11 2025-10-15 15:40:21 +03:00