Commit graph

556 commits

Author SHA1 Message Date
Pavel Zilke
141a646012 DEVOPS-1787 new docker-compose 2024-08-28 23:09:40 +03:00
Pavel Zilke
fbce5162a1 DEVOPS-1787 2024-08-28 23:02:33 +03:00
Makarova Elena
046a727bdb заменила на комбобокс статичный список 2024-08-28 10:47:27 +03:00
Makarova Elena
faf5a0aef4 Merge remote-tracking branch 'origin/develop' into develop 2024-08-27 16:31:12 +03:00
m.epshtein
aa15663f51 tooltip 2024-08-27 16:30:07 +03:00
Makarova Elena
7a51f2f00a текст подсказки на кнопке, убрала видимость у id_ERN 2024-08-27 15:06:00 +03:00
Makarova Elena
0b05e1c757 доработка жёлтго цвета в графиках, поиск граждан перевела а 1 группу фильтров 2024-08-27 14:41:34 +03:00
Makarova Elena
8ba28b05d5 Merge remote-tracking branch 'origin/develop' into develop 2024-08-27 13:24:35 +03:00
m.epshtein
56aeecdb7f fix 2024-08-27 13:20:44 +03:00
Makarova Elena
64414288fc Merge remote-tracking branch 'origin/develop' into develop 2024-08-27 10:53:08 +03:00
m.epshtein
1448abde1d chromium 2024-08-26 21:01:32 +03:00
m.epshtein
184fe09c56 Merge branch 'develop' into feature/browser-old-version 2024-08-26 18:04:25 +03:00
Makarova Elena
459d5b3827 обновила бд + настройка страниц 2024-08-26 18:01:59 +03:00
m.epshtein
3373205b9e old version 2024-08-26 16:27:59 +03:00
Makarova Elena
b2cdcb1ba2 Merge branch 'SUPPORT-8500' into develop 2024-08-26 10:34:30 +03:00
Makarova Elena
f1e3eb95a9 Merge remote-tracking branch 'origin/develop' into SUPPORT-8500 2024-08-26 10:33:54 +03:00
m.epshtein
142283eb36 Merge branch 'develop' of 10.10.31.70:/ervu-dashboard into develop 2024-08-26 09:31:17 +03:00
m.epshtein
ba81a7589d 8500 2024-08-26 09:30:43 +03:00
Makarova Elena
7b19381425 Merge branch 'feature/SUPPORT-8512_add_project_adapter' into develop 2024-08-26 09:17:45 +03:00
m.epshtein
debaca2e81 z-index 2024-08-23 12:46:16 +03:00
Makarova Elena
ec05ff34f0 Merge remote-tracking branch 'origin/SUPPORT-8500_develop_merged' into SUPPORT-8500 2024-08-23 10:17:01 +03:00
Рауф Латыпов
3d34b7530e SUPPORT-8512: project adapter and adapter provider added 2024-08-23 09:37:37 +03:00
Makarova Elena
f448646cbe Merge remote-tracking branch 'origin/test_testrecruitment' into develop 2024-08-23 00:11:45 +03:00
Makarova Elena
c1993af00c Merge remote-tracking branch 'origin/test_testrecruitment' into develop 2024-08-23 00:05:54 +03:00
Makarova Elena
071c81abfd testspring_autumn 2024-08-22 23:54:35 +03:00
Makarova Elena
9c37945dbb Merge remote-tracking branch 'origin/develop' into develop 2024-08-22 21:50:52 +03:00
Makarova Elena
dbc3e881e8 поправила комбобокс с бизнес айди 2024-08-22 21:49:33 +03:00
m.epshtein
9a514ef1dc Merge branch 'develop' of 10.10.31.70:/ervu-dashboard into develop 2024-08-22 21:20:26 +03:00
m.epshtein
51d3e6ab5f label 2024-08-22 21:20:13 +03:00
Халтобин Евгений
3cdb741186 Apply number formatter 2024-08-22 21:11:30 +03:00
Халтобин Евгений
a969d28bba Apply number formatter 2024-08-22 20:57:17 +03:00
Makarova Elena
80e15f7778 правки по testrecruitment_id 2024-08-22 20:30:51 +03:00
Makarova Elena
8df15eeec1 Merge remote-tracking branch 'origin/feature/combobox_filterComponent' into develop 2024-08-22 18:48:13 +03:00
Халтобин Евгений
fb61d3e707 Implement combobox filter component 2024-08-22 18:47:07 +03:00
Рауф Латыпов
7d84a23a0a update studio version for page 2024-08-22 17:20:21 +03:00
Рауф Латыпов
14ebf17196 Merge branch 'develop' into SUPPORT-8500_develop_merged
# Conflicts:
#	backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Keys.java
#	backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java
#	backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java
#	backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/Citizen.java
#	backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/CitizenRecord.java
#	resources/src/main/resources/business-model/citizen.page
2024-08-22 16:54:53 +03:00
m.epshtein
df46a582c4 search-date 2024-08-22 16:32:59 +03:00
m.epshtein
2c4aabbddf Merge branch 'SUPPORT-8500' of 10.10.31.70:/ervu-dashboard into SUPPORT-8500 2024-08-22 15:15:57 +03:00
m.epshtein
4dc95b0167 // 2024-08-22 15:15:50 +03:00
Makarova Elena
b996d4ce04 класс для vbox с датами 2024-08-22 15:11:19 +03:00
Makarova Elena
d0fe3443c1 Merge remote-tracking branch 'origin/develop' into develop 2024-08-22 13:21:23 +03:00
m.epshtein
c5b67a6e64 update-data display: none 2024-08-22 13:12:01 +03:00
m.epshtein
c9ac7e4372 Merge branch 'SUPPORT-8500' of 10.10.31.70:/ervu-dashboard into SUPPORT-8500 2024-08-22 13:09:25 +03:00
m.epshtein
dc0fba702e // 2024-08-22 13:09:13 +03:00
Makarova Elena
a46987c0bd фильтр в графах по public.pub_recruitment.code 2024-08-22 13:05:33 +03:00
Makarova Elena
56071e9c3b обновила бд 2024-08-22 13:03:22 +03:00
Makarova Elena
7306a5f5cc Merge remote-tracking branch 'origin/feature/SUPPORT-8461_installed_3.177.3' into develop 2024-08-22 11:57:12 +03:00
Makarova Elena
7272d01c17 фильтр на одном блоке 2024-08-22 11:40:38 +03:00
Makarova Elena
6fa48a51a5 фильтр- комбобоксы заменила текст-фильтрамми 2024-08-22 11:09:10 +03:00
Рауф Латыпов
8e523e649e platform version 3.177.3 2024-08-22 10:11:35 +03:00