Commit graph

718 commits

Author SHA1 Message Date
adel.ka
97b1a3b810 SUPPORT-9572:change 2025-11-17 11:12:52 +03:00
Eduard Tihomiorv
04fe70f204 fix 2025-11-14 12:22:44 +03:00
Eduard Tihomiorv
079cf09dad fix 2025-11-10 12:41:44 +03:00
Eduard Tihomiorv
77d3ae63d0 Merge branch 'feature/SUPPORT-9546_mchd_power' into develop 2025-11-10 11:18:19 +03:00
Eduard Tihomiorv
eeb7f64e5e fix 2025-11-10 11:12:54 +03:00
Eduard Tihomiorv
ae895a056d fix 2025-11-10 10:16:32 +03:00
Eduard Tihomiorv
9404b576b1 SUPPORT-9546: Fix 2025-11-07 15:45:30 +03:00
Eduard Tihomiorv
fc8f03aee6 SUPPORT-9546: Fix 2025-11-07 14:52:45 +03:00
Eduard Tihomiorv
72fb14e5b6 fix 2025-11-07 14:13:56 +03:00
adel.ka
77cf4f3f6c refactor 2025-11-07 11:00:18 +03:00
adel.ka
5a2f67c57f Merge remote-tracking branch 'origin/feature/SUPPORT-9531' into develop
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/journal/mapper/JournalDtoMapper.java
2025-11-07 10:59:22 +03:00
Eduard Tihomiorv
6da5b0e096 Merge branch 'feature/SUPPORT-9484_fix_date' into develop 2025-11-07 10:05:22 +03:00
Eduard Tihomiorv
8c33cbc7b8 Merge branch 'feature/SUPPORT-9536_fix_mchd' into develop 2025-11-07 10:03:49 +03:00
Eduard Tihomiorv
de2db2a9db SUPPORT-9536: Fix npe 2025-11-07 09:46:17 +03:00
Eduard Tihomiorv
1297ac89e8 SUPPORT-9484: fix 2025-11-05 15:18:26 +03:00
Eduard Tihomiorv
b251439461 SUPPORT-9536: Fix 2025-11-05 15:11:13 +03:00
adel.ka
1609e3137e Merge branch 'feature/SUPPORT-9528' into develop 2025-11-01 15:42:48 +03:00
adel.ka
e7394dd11b SUPPORT-9531: sort fix 2025-11-01 14:11:43 +03:00
adel.ka
ece8b20c38 Revert "SUPPORT-9528: sort fix"
This reverts commit a134a96b27.
2025-11-01 14:11:26 +03:00
adel.ka
a134a96b27 SUPPORT-9528: sort fix 2025-11-01 12:36:59 +03:00
Eduard Tihomiorv
17b2469b2b SUPPORT-9525: Fix 2025-10-31 17:03:59 +03:00
adel.ka
b96010133f SUPPORT-9528: add messageId 2025-10-31 16:52:52 +03:00
Eduard Tihomiorv
15e4967ee4 SUPPORT-9509: Fix review 2025-10-31 10:31:34 +03:00
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
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
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
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
adel.ka
3d5e548b2b SUPPORT-9497: ogrn check 2025-10-24 09:34:24 +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
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
e74ecab7e5 SUPPORT-9368: добавил инфу для аудита 2025-10-19 04:36:15 +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
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
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
adel.ka
33c0a42517 Для команды Соловьева fix 2025-10-15 16:15:55 +03:00
adel.ka
64cc5ff7a9 Для команды Соловьева 2025-10-15 16:14:52 +03:00
adel.ka
d84b08411d SUPPORT-9368: new journal 2025-10-15 11:05:21 +03:00