Фоат Саляхов
aa7b2ed13b
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
...
* origin/ervu/tmp_makets:
fix extension
2024-11-14 14:37:53 +03:00
Фоат Саляхов
d27c23c6a3
Добавление легенды
2024-11-14 14:37:15 +03:00
Булат Хайруллин
e5a407a4ed
fix extension
2024-11-14 14:31:25 +03:00
Фоат Саляхов
b4fc2c51d4
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
...
* origin/ervu/tmp_makets:
сдвиг вправо
2024-11-14 14:25:29 +03:00
Makarova Elena
f9681bd49d
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
2024-11-14 14:09:23 +03:00
Makarova Elena
723167fe87
сдвиг вправо
2024-11-14 14:09:11 +03:00
Фоат Саляхов
512dbe77df
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
...
* origin/develop:
fix_changeSet_2
fix_changeSet
changeSetIdFix
2024-11-14 13:59:30 +03:00
Фоат Саляхов
0bf1d4247f
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
...
* origin/ervu/tmp_makets:
центрирование кнопок и нажатие
ERVU-168_appeals
ERVU-168_db_incidents
2024-11-14 13:59:21 +03:00
Фоат Саляхов
d465fd39bd
Добавление график-бублика 1,3
2024-11-14 13:57:21 +03:00
Makarova Elena
6285906b43
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
2024-11-14 13:27:30 +03:00
ilyin
f7169ccda0
fix_changeSet_2
2024-11-14 12:35:25 +03:00
ilyin
ce626709c3
fix_changeSet
2024-11-14 12:32:45 +03:00
Makarova Elena
ef2ddf40b9
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
2024-11-14 12:08:57 +03:00
ilyin
293c3e10ca
changeSetIdFix
2024-11-14 12:02:34 +03:00
Makarova Elena
89bc5a6650
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
2024-11-14 11:04:18 +03:00
Makarova Elena
d453203c7d
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
2024-11-14 11:04:08 +03:00
Makarova Elena
a66cec9143
центрирование кнопок и нажатие
2024-11-14 11:03:40 +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
Фоат Саляхов
edb49e2008
моки столбцы
2024-11-13 17:17:52 +03:00
Фоат Саляхов
691ceb92d8
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
...
* origin/ervu/tmp_makets:
//
2024-11-13 16:37:03 +03:00
Makarova Elena
5141d0b4fc
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
2024-11-13 16:36:25 +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
Фоат Саляхов
703561b850
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
...
* origin/ervu/tmp_makets:
первая страница настроена на бд
2024-11-13 16:28:07 +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
