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 |
|
Булат Хайруллин
|
dfb9939419
|
fix dockerfiles
|
2024-11-11 15:06:58 +03:00 |
|
kochetkov
|
5265c43b82
|
Merge branch 'ervu/tmp_makets' into ervu/develop
|
2024-11-11 14:35:16 +03:00 |
|
kochetkov
|
0f2c2a0a57
|
fix paths
|
2024-11-11 14:35:03 +03:00 |
|
Булат Хайруллин
|
82e325aa16
|
micord.env для теста changesetov
|
2024-11-11 13:54:36 +03:00 |
|
Булат Хайруллин
|
e8ff314591
|
Merge branch 'ervu/tmp_makets' into ervu/develop
|
2024-11-11 13:52:05 +03:00 |
|
kochetkov
|
dc094cb68c
|
fix paths
|
2024-11-11 12:19:10 +03:00 |
|
kochetkov
|
2dd9641d0c
|
fix path
|
2024-11-11 12:13:30 +03:00 |
|
ilyin
|
bc738f779e
|
save
|
2024-11-10 20:24:31 +03:00 |
|
ilyin
|
cf372814be
|
save
|
2024-11-10 15:23:25 +03:00 |
|
ilyin
|
853d6e65cf
|
save
|
2024-11-10 14:32:10 +03:00 |
|
ilyin
|
7684c1cf78
|
save
|
2024-11-10 14:03:32 +03:00 |
|
ilyin
|
337f0ad0e3
|
save
|
2024-11-10 13:33:59 +03:00 |
|
ilyin
|
59e2b6a9be
|
save
|
2024-11-10 13:24:24 +03:00 |
|
ilyin
|
9a6b164691
|
save
|
2024-11-09 22:20:30 +03:00 |
|
ilyin
|
1072a5b02d
|
save
|
2024-11-09 21:51:14 +03:00 |
|
ilyin
|
2ca4ac535f
|
save
|
2024-11-09 21:23:20 +03:00 |
|
ilyin
|
a5977f0bba
|
db
|
2024-11-09 19:30:16 +03:00 |
|
ilyin
|
90e380972d
|
save
|
2024-11-09 19:29:33 +03:00 |
|
ilyin
|
6bfe0f77f3
|
Merge remote-tracking branch 'origin/ervu/develop' into ervu/tmp_makets
|
2024-11-09 18:24:24 +03:00 |
|
ilyin
|
4428304605
|
save
|
2024-11-09 17:53:57 +03:00 |
|
ilyin
|
7eb2955d81
|
save
|
2024-11-09 11:31:24 +03:00 |
|
kochetkov
|
2c61fa7882
|
Auto stash before checking out "origin/ervu/tmp_makets"
|
2024-11-09 09:58:46 +03:00 |
|
ilyin
|
258d6060d4
|
save
|
2024-11-08 23:52:30 +03:00 |
|
Фоат Саляхов
|
70b6c5c4b5
|
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
* origin/ervu/tmp_makets:
bg colours
selectize-dropdown
//
graph-donut
|
2024-11-08 17:34:49 +03:00 |
|
Фоат Саляхов
|
ae2f8e1fad
|
Доработка выпадающего списка регионов, добавления в БД таблицы по регионом, настройка 1-3 графиков и отображения значений, добавления сss
|
2024-11-08 17:33:26 +03:00 |
|
Alexander Kochetkov
|
4e0e35289e
|
ERVU-168
|
2024-11-08 14:00:11 +03:00 |
|
m.epshtein
|
73e38135ed
|
bg colours
|
2024-11-08 12:44:23 +03:00 |
|
m.epshtein
|
778830aae9
|
selectize-dropdown
|
2024-11-08 12:24:12 +03:00 |
|
m.epshtein
|
22037a29d6
|
//
|
2024-11-08 11:55:07 +03:00 |
|
m.epshtein
|
fc0dc67d0e
|
Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
|
2024-11-08 11:17:57 +03:00 |
|
m.epshtein
|
5150549a57
|
graph-donut
|
2024-11-08 11:17:45 +03:00 |
|
Фоат Саляхов
|
e0725c599b
|
2 раздел тртьего ряда
|
2024-11-08 09:50:05 +03:00 |
|
Фоат Саляхов
|
cfed5055cc
|
Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets
* origin/ervu/tmp_makets:
fix
|
2024-11-07 17:52:56 +03:00 |
|
Фоат Саляхов
|
a16f7901eb
|
Первый график, граф снущности первого ряда, первого раздела
|
2024-11-07 17:52:02 +03:00 |
|
kochetkov
|
ba85a09e80
|
Merge branch 'ervu/tmp_makets' of 10.10.31.70:ervu-business-metrics into ervu/tmp_makets
|
2024-11-07 16:40:45 +03:00 |
|
kochetkov
|
996824e2ca
|
fix
|
2024-11-07 16:40:39 +03:00 |
|
m.epshtein
|
39c9937304
|
new font
|
2024-11-07 14:46:03 +03:00 |
|
m.epshtein
|
8430751a04
|
arrow
|
2024-11-07 14:26:29 +03:00 |
|
m.epshtein
|
bdf7df0114
|
combo-box
|
2024-11-07 14:01:00 +03:00 |
|
m.epshtein
|
553d23f0b2
|
Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
|
2024-11-07 13:16:16 +03:00 |
|
m.epshtein
|
c9625a0491
|
panel icons
|
2024-11-07 13:16:01 +03:00 |
|
Фоат Саляхов
|
f5d0010bef
|
Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
|
2024-11-07 11:32:42 +03:00 |
|
Фоат Саляхов
|
abe4b45c46
|
мелкие правки
|
2024-11-07 11:32:33 +03:00 |
|
m.epshtein
|
2df5c7d435
|
new icons
|
2024-11-07 11:20:58 +03:00 |
|
Фоат Саляхов
|
c5dd448921
|
Merge branch 'ervu/tmp_makets' of 10.10.31.70:/ervu-business-metrics into ervu/tmp_makets
# Conflicts:
# resources/src/main/resources/business-model/ervu-business-metrics/conversion.page
|
2024-11-07 09:38:26 +03:00 |
|