Commit graph

1543 commits

Author SHA1 Message Date
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
6c39d39a7a Merge remote-tracking branch 'origin/feature/SUPPORT-9533' into develop 2025-11-05 13:39:45 +03:00
adel.ka
0397c7f22c SUPPORT-9533: refactor 2025-11-05 12:38:52 +03:00
adel.ka
dc7448b8bf SUPPORT-9533: refactor 2025-11-05 12:24:40 +03:00
adel.ka
8b8be81bf3 SUPPORT-9533: sort fix 2025-11-05 12:16:16 +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
d106b37d8e Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-9509_fix_mchd 2025-10-31 16:35:04 +03:00
Халтобин Евгений
bf6ee66e17 added mchd doc 2025-10-31 13:45:04 +03:00
Eduard Tihomiorv
15e4967ee4 SUPPORT-9509: Fix review 2025-10-31 10:31:34 +03:00
Eduard Tihomiorv
e519f0a52e SUPPORT-9509:Fix 2025-10-30 11:01:14 +03:00
Eduard Tihomiorv
d308f13bf5 SUPPORT-9509: Fix 2025-10-28 11:33:23 +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
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