root
|
e7c8867948
|
Update for next development version
|
2024-11-20 16:57:48 +03:00 |
|
root
|
5d4ad8078f
|
Update to hotfix version
|
2024-11-20 16:57:45 +03:00 |
|
root
|
1124882f4c
|
Update develop version back to pre-merge state
|
2024-11-20 16:41:01 +03:00 |
|
root
|
f1749032b2
|
Update develop to production version to avoid merge conflicts
|
2024-11-20 16:40:58 +03:00 |
|
root
|
225d732bc3
|
Update for next development version
|
2024-11-20 16:02:48 +03:00 |
|
Булат Хайруллин
|
e348d37bf0
|
график по обжалованиям поправил
|
2024-11-20 14:56:42 +03:00 |
|
kochetkov
|
c97f464cbf
|
sync with ervu develop
|
2024-11-20 14:38:11 +03:00 |
|
kochetkov
|
367cc17235
|
sync poms and delete test module
|
2024-11-20 14:21:16 +03:00 |
|
Булат Хайруллин
|
645bd532a7
|
код диспансерного учета снял дизабл
|
2024-11-19 18:42:52 +03:00 |
|
Булат Хайруллин
|
caed01028b
|
Блок занятость. Переделал под столбчатую диаграмму
|
2024-11-19 18:42:38 +03:00 |
|
Булат Хайруллин
|
b3645075fd
|
treeview collapse level=2
|
2024-11-14 23:52:58 +03:00 |
|
Булат Хайруллин
|
6d33114740
|
treeview на всех страницах
|
2024-11-14 23:32:32 +03:00 |
|
Булат Хайруллин
|
9e5821a1ed
|
treeview
|
2024-11-14 21:31:45 +03:00 |
|
kochetkov
|
c4a159b161
|
Merge branch 'develop' into feature/SUPPORT-8392_add_fork_component
# Conflicts:
# frontend/src/ts/modules/app/app.module.ts
|
2024-11-13 16:00:45 +03:00 |
|
ivanov.denis
|
42ca17209e
|
Merge branch 'develop' into feature/SUPPORT-8598_add_last_record_date
|
2024-11-01 17:30:46 +03:00 |
|
ivanov.denis
|
3e69ea3fc2
|
beans fix
|
2024-11-01 17:30:37 +03:00 |
|
y.kuznetsova
|
feeea9d85e
|
SUPPORT-8392 delete old file and fix version
|
2024-10-29 17:01:08 +03:00 |
|
r.gaztdinov
|
b70bfef7dc
|
age, db
|
2024-10-29 10:02:02 +03:00 |
|
r.gaztdinov
|
20b1c48e9d
|
open filters
|
2024-10-28 16:55:42 +03:00 |
|
Alexandr Shalaginov
|
069e348b04
|
fix merge
|
2024-10-23 14:39:13 +03:00 |
|
Alexandr Shalaginov
|
0513fa6270
|
Merge branch 'develop' into feature/SUPPORT-8598_add_last_record_date
# Conflicts:
# backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/appeals/Keys.java
# backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/appeals/tables/ReviewRating.java
# backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/PubRecruitment.java
# backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java
# backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java
# backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/LastRecordingDate.java
# backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/LastRecordingDateRecord.java
# resources/src/main/resources/business-model/main.page
# resources/src/main/resources/business-model/milregistration.page
# resources/src/main/resources/business-model/notregistered.page
# resources/src/main/resources/business-model/Всего на учете (2й уровень).page
|
2024-10-23 14:32:40 +03:00 |
|
Булат Хайруллин
|
ae47657ec4
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8508_add_age_citizen' into develop
# Conflicts:
# resources/src/main/resources/business-model/citizencard.page
|
2024-10-22 15:38:14 +03:00 |
|
Булат Хайруллин
|
fff34b407a
|
Merge branch 'develop' into feature/SUPPORT-8500_add_new_formatter
|
2024-10-22 11:23:12 +03:00 |
|
Artyom Hackimullin
|
ca2bb7da52
|
Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8508_add_age_citizen
|
2024-10-22 10:56:30 +03:00 |
|
Artyom Hackimullin
|
2c85df34ba
|
SUPPORT-8508: add pages
|
2024-10-22 10:46:21 +03:00 |
|
adel.kalimullin
|
86bef6413f
|
SUPPORT-8500: fix page (1)
|
2024-10-21 16:52:40 +03:00 |
|
adel.kalimullin
|
bf7fe433ff
|
SUPPORT-8500: fix page
|
2024-10-21 16:45:55 +03:00 |
|
root
|
638b72877e
|
Update for next development version
|
2024-10-11 14:13:30 +03:00 |
|
root
|
c65a83b1d4
|
Update for next development version
|
2024-10-11 14:13:24 +03:00 |
|
Булат Хайруллин
|
fe982ed155
|
правки по барам
|
2024-10-11 13:13:49 +03:00 |
|
agent46
|
49c65a3968
|
Update versions for hotfix
|
2024-10-11 12:55:53 +03:00 |
|
root
|
1625742c60
|
Update for next development version
|
2024-10-11 00:05:26 +03:00 |
|
Булат Хайруллин
|
3d2346bbd4
|
fix
|
2024-10-11 00:01:00 +03:00 |
|
Makarova Elena
|
8042b7c742
|
настроила все бары на колнки бд
|
2024-10-10 10:40:37 +03:00 |
|
Makarova Elena
|
3e75c2ae4b
|
настроила бары всего на учете
|
2024-10-09 21:00:40 +03:00 |
|
Alexandr Shalaginov
|
e03f01bf1d
|
SUPPORT-8598: refactor
|
2024-10-09 10:26:34 +03:00 |
|
root
|
9fad75173e
|
Update for next development version
|
2024-10-07 16:58:35 +03:00 |
|
root
|
4b581ca09f
|
Update for next development version
|
2024-10-07 16:58:30 +03:00 |
|
Булат Хайруллин
|
28174e8487
|
infinite_load table
|
2024-10-07 16:55:52 +03:00 |
|
root
|
1350e053b8
|
Update versions for hotfix
|
2024-10-07 16:45:28 +03:00 |
|
root
|
a74208d080
|
Update for next development version
|
2024-10-07 16:35:06 +03:00 |
|
Булат Хайруллин
|
cb7b4763f8
|
правки в карточке гражданина
|
2024-10-04 21:45:48 +03:00 |
|
root
|
8256482af6
|
Update for next development version
|
2024-09-30 18:36:02 +03:00 |
|
root
|
a1aa4504f3
|
Update to hotfix version
|
2024-09-30 18:35:59 +03:00 |
|
root
|
e7315a5225
|
Update develop version back to pre-merge state
|
2024-09-30 17:00:51 +03:00 |
|
root
|
346c156cf5
|
Update develop to production version to avoid merge conflicts
|
2024-09-30 17:00:49 +03:00 |
|
root
|
bea44a1634
|
Update for next development version
|
2024-09-30 16:09:35 +03:00 |
|
Makarova Elena
|
b413f9cd36
|
Merge remote-tracking branch 'origin/develop' into new_citizencard
|
2024-09-30 14:54:46 +03:00 |
|
Makarova Elena
|
0665cf7042
|
вернула комбобокс с субъектами
|
2024-09-30 13:35:10 +03:00 |
|
Makarova Elena
|
b09c33640f
|
заменила скрипт на колонке
|
2024-09-27 10:44:54 +03:00 |
|