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 |
|
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 |
|
Фоат Саляхов
|
0309cd900f
|
Обновление бд
|
2024-11-12 13:04:08 +03:00 |
|
Фоат Саляхов
|
8e3119b4eb
|
Изменение апп рутиниг
|
2024-11-12 13:01:25 +03:00 |
|
Фоат Саляхов
|
4500c42041
|
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
* origin/ervu/tmp_makets:
fix pages
|
2024-11-12 12:48:57 +03:00 |
|
Булат Хайруллин
|
81e819e3b7
|
Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
|
2024-11-12 12:47:24 +03:00 |
|
Булат Хайруллин
|
ce6ee20f34
|
fix pages
|
2024-11-12 12:46:33 +03:00 |
|
Фоат Саляхов
|
545ab056e5
|
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
* origin/ervu/tmp_makets:
remove dashboard names
|
2024-11-12 10:52:33 +03:00 |
|
Булат Хайруллин
|
4013727636
|
Merge branch 'develop' into ervu/tmp_makets
# Conflicts:
# frontend/src/resources/css/components-dashboard.css
|
2024-11-12 10:50:55 +03:00 |
|
Фоат Саляхов
|
645d499635
|
мелкие правки
|
2024-11-12 10:31:11 +03:00 |
|
Фоат Саляхов
|
28fb4a62f0
|
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
* origin/ervu/tmp_makets:
panel-btn
|
2024-11-12 09:30:52 +03:00 |
|
kochetkov
|
17fc0cc17b
|
remove dashboard names
|
2024-11-12 09:24:18 +03:00 |
|
m.epshtein
|
a0feea7bfd
|
Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
|
2024-11-12 09:21:56 +03:00 |
|
m.epshtein
|
04f4166b11
|
panel-btn
|
2024-11-12 09:21:44 +03:00 |
|
Фоат Саляхов
|
bd3d520b0e
|
Мелки правки
|
2024-11-12 09:19:13 +03:00 |
|
Фоат Саляхов
|
526f257b41
|
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
* origin/develop:
fix log filename
патчи бд и бины + AppConfig.java
перенес патчи бд
|
2024-11-12 09:03:31 +03:00 |
|
kochetkov
|
f092b0d1a4
|
fix log filename
|
2024-11-12 08:45:51 +03:00 |
|
Булат Хайруллин
|
68e83b5c16
|
патчи бд и бины + AppConfig.java
|
2024-11-11 21:37:01 +03:00 |
|
Булат Хайруллин
|
2ca6399743
|
перенес патчи бд
|
2024-11-11 17:56:27 +03:00 |
|
Фоат Саляхов
|
2968b9cf24
|
Merge remote-tracking branch 'origin/develop' into ervu/tmp_makets
* origin/develop:
Update for next development version
fix version
fix frontend name
fix dockerfiles
переименовал проект
|
2024-11-11 17:50:17 +03:00 |
|
Фоат Саляхов
|
55cf579a19
|
Добавление всех страниц, кнопок и url
|
2024-11-11 17:49:43 +03:00 |
|
kochetkov
|
8cf10473b9
|
Update for next development version
|
2024-11-11 15:50:10 +03:00 |
|
kochetkov
|
52dccf3523
|
fix version
|
2024-11-11 15:46:52 +03:00 |
|
kochetkov
|
00ec51bf21
|
Merge branch 'ervu/develop' into develop
# Conflicts:
# backend/pom.xml
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
# test/pom.xml
|
2024-11-11 15:45:33 +03:00 |
|
kochetkov
|
953f4d014b
|
fix frontend name
|
2024-11-11 15:35:11 +03:00 |
|
Булат Хайруллин
|
02d5b88043
|
Merge branch 'ervu/develop' of 10.10.31.70:/ervu-business-metrics into ervu/develop
|
2024-11-11 15:07:04 +03:00 |
|