kochetkov
|
38cffe4a7e
|
fix after merge
|
2024-09-02 09:58:05 +03:00 |
|
kochetkov
|
d0322684f0
|
Merge branch 'develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat
# Conflicts:
# Dockerfile
|
2024-09-02 09:57:41 +03:00 |
|
Булат Хайруллин
|
0ac16a2eb0
|
фиксы
|
2024-08-31 22:31:22 +03:00 |
|
Булат Хайруллин
|
e5263bc496
|
fix filter combobox
|
2024-08-30 16:27:58 +03:00 |
|
Булат Хайруллин
|
3d008a9486
|
db beans
|
2024-08-30 16:01:47 +03:00 |
|
Булат Хайруллин
|
607bdf46e8
|
Merge branch 'develop' of 10.10.31.70:/ervu-dashboard into develop
# Conflicts:
# resources/src/main/resources/business-model/notregistered.page
# resources/src/main/resources/business-model/Всего на учете (2й уровень).page
|
2024-08-30 16:01:24 +03:00 |
|
Булат Хайруллин
|
c9e22efc9c
|
fix filters in pages
|
2024-08-30 15:59:21 +03:00 |
|
Pavel Zilke
|
8024552e4a
|
DEVOPS-1787 Docker refactoring
|
2024-08-30 00:24:52 +03:00 |
|
Pavel Zilke
|
4024fac6da
|
DEVOPS-1787
|
2024-08-30 00:15:27 +03:00 |
|
kochetkov
|
21e76ef499
|
Merge remote-tracking branch 'origin/develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat
|
2024-08-29 16:32:56 +03:00 |
|
kochetkov
|
e037972211
|
WEBBPMNEXT-9175 migrate to tomcat
|
2024-08-29 16:26:39 +03:00 |
|
Pavel Zilke
|
6a45def86c
|
Merge branch 'develop' of 10.10.31.70:ervu-dashboard into develop
|
2024-08-29 15:44:10 +03:00 |
|
Makarova Elena
|
4c8b3ffe7e
|
доработка в дао фильтров
|
2024-08-29 15:17:44 +03:00 |
|
Pavel Zilke
|
89a1fdd2a0
|
DEVOPS-1787
|
2024-08-29 13:03:38 +03:00 |
|
Pavel Zilke
|
474030047f
|
DEVOPS-1787 fix docker-compose
|
2024-08-28 23:20:09 +03:00 |
|
Pavel Zilke
|
9ed7325726
|
DEVOPS-1787 fix Dockerfile
|
2024-08-28 23:16:36 +03:00 |
|
Pavel Zilke
|
00134b2905
|
DEVOPS-1787 fix docker-compose
|
2024-08-28 23:13:01 +03:00 |
|
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 |
|