root
|
e7c8867948
|
Update for next development version
|
2024-11-20 16:57:48 +03:00 |
|
root
|
fe67f751f8
|
Merge tag '1.9.1' into develop
Tag hotfix
|
2024-11-20 16:57:45 +03:00 |
|
root
|
5d4ad8078f
|
Update to hotfix version
|
2024-11-20 16:57:45 +03:00 |
|
root
|
4068b9250c
|
Merge branch 'hotfix/1.9.1'
|
2024-11-20 16:57:43 +03:00 |
|
root
|
570e7e99af
|
Update for next development version
|
2024-11-20 16:57:43 +03:00 |
|
root
|
31c8805913
|
Update versions for hotfix
|
2024-11-20 16:54:30 +03:00 |
|
root
|
1124882f4c
|
Update develop version back to pre-merge state
|
2024-11-20 16:41:01 +03:00 |
|
root
|
d3a1763ddc
|
Merge tag '1.9.0' into develop
Tag release
|
2024-11-20 16:40:58 +03:00 |
|
root
|
f1749032b2
|
Update develop to production version to avoid merge conflicts
|
2024-11-20 16:40:58 +03:00 |
|
root
|
dcf3a00926
|
Merge branch 'release/1.9.0'
|
2024-11-20 16:40:55 +03:00 |
|
root
|
eb703b6664
|
Update for next development version
|
2024-11-20 16:40:55 +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
|
189da45a2d
|
sync with ervu develop
|
2024-11-20 14:26:21 +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 |
|
kochetkov
|
7a125a7efd
|
fixes after update merge
|
2024-11-15 09:53:53 +03:00 |
|
kochetkov
|
08d4aa015b
|
Merge remote-tracking branch 'origin/update/3.185' into develop
# Conflicts:
# frontend/package.json
|
2024-11-15 09:45:40 +03:00 |
|
Булат Хайруллин
|
b3645075fd
|
treeview collapse level=2
|
2024-11-14 23:52:58 +03:00 |
|
Булат Хайруллин
|
0438d09e6c
|
Merge branch 'feature/SUPPORT-8392_add_fork_component' into develop
|
2024-11-14 23:33:21 +03:00 |
|
Булат Хайруллин
|
6d33114740
|
treeview на всех страницах
|
2024-11-14 23:32:32 +03:00 |
|
Булат Хайруллин
|
9e5821a1ed
|
treeview
|
2024-11-14 21:31:45 +03:00 |
|
kochetkov
|
fa4c14c448
|
fix
|
2024-11-14 09:53:24 +03:00 |
|
kochetkov
|
130a4ddb7f
|
update package-lock
|
2024-11-14 09:48:40 +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
|
7ff602baed
|
package.json update
|
2024-11-07 16:28:38 +03:00 |
|
ivanov.denis
|
5201695472
|
release 3.185.0
|
2024-11-07 16:18:13 +03:00 |
|
ivanov.denis
|
b1522ae85c
|
Merge remote-tracking branch 'origin/develop' into update/3.185
|
2024-11-07 16:17:03 +03:00 |
|
ivanov.denis
|
7a4b16553e
|
beans fix
|
2024-11-01 17:31:29 +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 |
|
ivanov.denis
|
70def07571
|
beans
|
2024-11-01 17:05:21 +03:00 |
|
y.kuznetsova
|
0f251248d5
|
SUPPORT-8392 fix css
|
2024-10-31 14:52:24 +03:00 |
|
y.kuznetsova
|
feeea9d85e
|
SUPPORT-8392 delete old file and fix version
|
2024-10-29 17:01:08 +03:00 |
|
Булат Хайруллин
|
2fc4a97dd0
|
Merge branch 'feature/SUPPORT-8617_add_patches' into develop
|
2024-10-29 15:23:20 +03:00 |
|
Artyom Hackimullin
|
6d85c9f983
|
SUPPORT-8606: add new changSet to rename column
|
2024-10-29 11:28:49 +03:00 |
|
Artyom Hackimullin
|
6730db6379
|
SUPPORT-8606: add new changeSet
|
2024-10-29 11:16:09 +03:00 |
|
r.gaztdinov
|
b70bfef7dc
|
age, db
|
2024-10-29 10:02:02 +03:00 |
|
Булат Хайруллин
|
efaa916df1
|
micord.env
|
2024-10-28 17:24:06 +03:00 |
|
Булат Хайруллин
|
1d62a4ab61
|
Merge branch 'feature/SUPPORT-8617_add_patches' into develop
|
2024-10-28 17:15:05 +03:00 |
|
r.gaztdinov
|
20b1c48e9d
|
open filters
|
2024-10-28 16:55:42 +03:00 |
|
y.kuznetsova
|
c68b188c2e
|
SUPPORT-8392 add for component
|
2024-10-28 14:30:10 +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 |
|
Artyom Hackimullin
|
7addd4e98b
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8617_add_patches' into feature/SUPPORT-8617_add_patches
|
2024-10-23 13:00:27 +03:00 |
|
Artyom Hackimullin
|
9ee36ac33b
|
SUPPORT-8617: fix function
|
2024-10-23 13:00:04 +03:00 |
|
Булат Хайруллин
|
27b8038210
|
DB_APP_NAME=ed_full to DB_APP_NAME=ed_empty
|
2024-10-23 11:10:11 +03:00 |
|
Artyom Hackimullin
|
f5ceeba02f
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8617_add_patches' into feature/SUPPORT-8617_add_patches
|
2024-10-23 09:16:26 +03:00 |
|