ilyin
ce626709c3
fix_changeSet
2024-11-14 12:32:45 +03:00
ilyin
293c3e10ca
changeSetIdFix
2024-11-14 12:02:34 +03:00
ilyin
2709f996f1
Merge branch 'develop' of 10.10.31.70:ervu-business-metrics into develop
2024-11-14 10:44:47 +03:00
ilyin
ff5ff6b78a
ERVU-168_appeals
2024-11-14 10:44:44 +03:00
Булат Хайруллин
15a8cca3a1
Merge branch 'develop' into ervu/tmp_makets
2024-11-13 16:35:50 +03:00
m.epshtein
fee3310502
//
2024-11-13 16:32:32 +03:00
Makarova Elena
49a71b8160
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
2024-11-13 16:27:40 +03:00
Makarova Elena
0820c86685
первая страница настроена на бд
2024-11-13 16:27:15 +03:00
Фоат Саляхов
2e9b89c740
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
...
* origin/develop:
//
tabs
2024-11-13 16:25:09 +03:00
m.epshtein
02d7bedbfd
//
2024-11-13 16:17:25 +03:00
m.epshtein
9ddf267f04
Merge branch 'develop' of 10.10.31.70:/ervu-business-metrics into develop
2024-11-13 15:51:50 +03:00
m.epshtein
50de56cc30
tabs
2024-11-13 15:51:40 +03:00
Фоат Саляхов
25e28061b9
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
...
* origin/develop:
btns
2024-11-13 13:20:19 +03:00
Фоат Саляхов
dab69ff1b8
удаление страницы конверсия1
2024-11-13 13:19:02 +03:00
m.epshtein
6fc49db60c
Merge branch 'develop' of 10.10.31.70:/ervu-business-metrics into develop
2024-11-13 12:46:25 +03:00
m.epshtein
497d6641ad
btns
2024-11-13 12:46:15 +03:00
Фоат Саляхов
59aa36cd04
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
...
# By Makarova Elena (1) and ilyin (1)
# Via Makarova Elena
* origin/ervu/tmp_makets:
промежуточный результат по странице
ERVU-168_first_registration_database
# Conflicts:
# backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Metrics.java
# backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/Tables.java
# backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/ViewConvertInfoRecordsFromEasu.java
# backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ConvertInfoRecordsFromEasuRecord.java
# backend/src/main/java/ru/micord/webbpm/ervu/business_metrics/db_beans/metrics/tables/records/ViewConvertInfoRecordsFromEasuRecord.java
2024-11-13 12:41:35 +03:00
ilyin
409755bc89
ERVU-168_db_incidents
2024-11-13 12:40:57 +03:00
Фоат Саляхов
74328f0619
Обновление бд, графики
2024-11-13 12:39:58 +03:00
Makarova Elena
672f632516
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
2024-11-13 12:27:54 +03:00
Makarova Elena
a6e585d952
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
2024-11-13 12:27:46 +03:00
Makarova Elena
6b97c53d82
промежуточный результат по странице
2024-11-13 12:27:07 +03:00
ilyin
fb7e7b1240
ERVU-168_first_registration_database
2024-11-13 12:03:09 +03:00
Фоат Саляхов
3f1c1fd6b7
Графики
2024-11-13 09:45:59 +03:00
Фоат Саляхов
17af0c82a9
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
...
* origin/develop:
ERVU-168
скрипты синка fix
скрипты синка
convertation_view
micord.env вернул стандартную бд
micord.env to test liquibase
2024-11-13 09:45:03 +03:00
Фоат Саляхов
443ff44a20
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
...
* origin/ervu/tmp_makets:
id
2024-11-12 18:01:50 +03:00
Фоат Саляхов
f4992f0a1e
правки по мнемониками и графикам на моках
2024-11-12 18:00:45 +03:00
Makarova Elena
1352e6f8d9
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
2024-11-12 17:46:08 +03:00
ilyin
e6ba00e420
Merge branch 'develop' of 10.10.31.70:ervu-business-metrics into develop
2024-11-12 16:37:16 +03:00
ilyin
aecae4c015
ERVU-168
2024-11-12 16:37:11 +03:00
Булат Хайруллин
c68b9f549d
скрипты синка fix
2024-11-12 16:36:59 +03:00
Булат Хайруллин
fbec64fceb
скрипты синка
2024-11-12 16:35:03 +03:00
ilyin
9257318f3b
Merge branch 'develop' of 10.10.31.70:ervu-business-metrics into develop
2024-11-12 15:10:54 +03:00
ilyin
2f53bdf8fd
convertation_view
2024-11-12 15:10:50 +03:00
Булат Хайруллин
afe124d562
micord.env вернул стандартную бд
2024-11-12 14:25:59 +03:00
Makarova Elena
fae1b20f14
Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
2024-11-12 14:23:42 +03:00
Makarova Elena
6961a2893a
id
2024-11-12 14:23:31 +03:00
Фоат Саляхов
cd167a2e37
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
...
* origin/ervu/tmp_makets:
fix combobox
2024-11-12 14:20:31 +03:00
Makarova Elena
22a2bb4331
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
2024-11-12 14:20:02 +03:00
Makarova Elena
b0011b6e9c
fix combobox
2024-11-12 14:19:38 +03:00
Булат Хайруллин
e60a40ddca
micord.env to test liquibase
2024-11-12 14:16:28 +03:00
Фоат Саляхов
c28d303f77
Рутинг Выпадающих списков
2024-11-12 14:12:31 +03:00
Фоат Саляхов
a9efbc8098
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
...
* origin/ervu/tmp_makets:
20241031-ERVU-168_create_db.xml fix
2024-11-12 14:00:21 +03:00
Makarova Elena
68b7c645e7
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
2024-11-12 14:00:17 +03:00
Булат Хайруллин
4370ae3dc5
Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
2024-11-12 13:55:49 +03:00
Булат Хайруллин
10564747b8
20241031-ERVU-168_create_db.xml fix
2024-11-12 13:55:44 +03:00
Makarova Elena
0b807ca1b6
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
2024-11-12 13:30:35 +03:00
Фоат Саляхов
e8f482db49
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
...
* origin/ervu/tmp_makets:
components-business-metrics.css
2024-11-12 13:30:22 +03:00
Булат Хайруллин
7b40cc7e6b
Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
2024-11-12 13:25:46 +03:00
Булат Хайруллин
705ab55909
components-business-metrics.css
2024-11-12 13:25:41 +03:00
