Zaripov Emil
|
56028f0130
|
Merge branch 'master' into develop
|
2025-02-24 14:41:14 +03:00 |
|
Zaripov Emil
|
9ef44a4469
|
set version 1.9.8
|
2025-02-24 14:39:58 +03:00 |
|
Zaripov Emil
|
1714be70f8
|
Merge branch 'hotfix/1.9.8'
|
2025-02-24 14:38:58 +03:00 |
|
Artyom Hackimullin
|
89b4dd9f98
|
Merge branch 'test/SUPPORT-8916_ip_valid' into test/ERVU-290_with_ip_valid
|
2025-02-24 14:29:37 +03:00 |
|
adel.kalimullin
|
df1600c3a5
|
SUPPORT-8938: add 2 pages
|
2025-02-24 14:22:23 +03:00 |
|
Artyom Hackimullin
|
285283e242
|
SUPPORT-8916: fix
|
2025-02-24 13:53:02 +03:00 |
|
Artyom Hackimullin
|
7d292985cf
|
SUPPORT-8916: revert page to dev
|
2025-02-24 12:39:32 +03:00 |
|
Artyom Hackimullin
|
0718495996
|
SUPPORT-8916: commited
|
2025-02-24 12:34:38 +03:00 |
|
Artyom Hackimullin
|
685e281b0a
|
Merge remote-tracking branch 'refs/remotes/origin/develop' into test/SUPPORT-8916_ip_valid
# Conflicts:
# resources/src/main/resources/business-model/Список заявок на пользователя/Создание заявки на добавление пользователя.page
|
2025-02-24 11:47:12 +03:00 |
|
Artyom Hackimullin
|
aa0fc88f6b
|
SUPPORT-8916: added custom component
|
2025-02-24 11:41:52 +03:00 |
|
Makarova Elena
|
dfcc212306
|
ERVU-296 по вводу ip-адреса
|
2025-02-24 11:33:42 +03:00 |
|
adel.kalimullin
|
845e9bf74b
|
SUPPORT-8938: fix
|
2025-02-24 09:55:21 +03:00 |
|
adel.kalimullin
|
a791be777e
|
SUPPORT-8938: fix
|
2025-02-24 09:49:27 +03:00 |
|
adel.kalimullin
|
35ccac540b
|
SUPPORT-8939: add css from dash
|
2025-02-21 19:41:12 +03:00 |
|
adel.kalimullin
|
a091e5e47f
|
SUPPORT-8939: fixes
|
2025-02-21 19:40:16 +03:00 |
|
Zaripov Emil
|
564f20f58e
|
Merge branch 'test' into release/ervu/1.9.8
|
2025-02-21 15:24:08 +03:00 |
|
Zaripov Emil
|
0570c31d94
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-02-21 15:23:29 +03:00 |
|
Artyom Hackimullin
|
68445726bc
|
SUPPORT-8916: set ip pattern
|
2025-02-21 12:34:41 +03:00 |
|
Artyom Hackimullin
|
79b34858a8
|
SUPPORT-8916: custom page
|
2025-02-21 12:07:38 +03:00 |
|
Makarova Elena
|
157a3d5388
|
ERVU-290 добавила выражение для проверки ip-адреса в поле с маской
|
2025-02-21 11:22:27 +03:00 |
|
adel.kalimullin
|
208a673219
|
SUPPORT-8939 sync
|
2025-02-20 10:58:43 +03:00 |
|
adel.kalimullin
|
bed2ecb29a
|
SUPPORT-8939 sync
|
2025-02-20 10:58:01 +03:00 |
|
adel.kalimullin
|
bd373e7991
|
Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8938_tree
|
2025-02-20 08:59:25 +03:00 |
|
Zaripov Emil
|
b72dfc172d
|
Merge branch 'develop' into hotfix/1.9.8
|
2025-02-19 16:46:16 +03:00 |
|
Zaripov Emil
|
fc1202ffd5
|
Merge branch 'test' into release/ervu/1.9.8
|
2025-02-19 16:45:15 +03:00 |
|
Zaripov Emil
|
e65cedb91c
|
reset
|
2025-02-19 16:42:12 +03:00 |
|
Zaripov Emil
|
627ea7f477
|
Merge branch 'dev' into test
|
2025-02-19 16:41:20 +03:00 |
|
Zaripov Emil
|
82ea79d854
|
sync
|
2025-02-19 16:39:45 +03:00 |
|
adel.kalimullin
|
91a8fa996a
|
SUPPORT-8939 sync
|
2025-02-19 16:37:47 +03:00 |
|
adel.kalimullin
|
62df65b235
|
SUPPORT-8939 sync
|
2025-02-19 16:34:09 +03:00 |
|
Zaripov Emil
|
fcfb233647
|
Merge remote-tracking branch 'origin/test/SUPPORT-8937_add_sort_combik' into develop
|
2025-02-19 16:32:52 +03:00 |
|
adel.kalimullin
|
8cdae9cdbb
|
test:remove sort in page
|
2025-02-19 15:40:09 +03:00 |
|
adel.kalimullin
|
08f1771021
|
Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8937_add_sort_combik
|
2025-02-19 15:32:43 +03:00 |
|
Makarova Elena
|
6ab0286a97
|
ERVU-290 доработка джаспер выгрузки в csv, заменила автокомплит на комбобокс в созданиии
|
2025-02-19 14:44:48 +03:00 |
|
adel.kalimullin
|
0e1f61b600
|
SUPPORT-8939:init tree
|
2025-02-19 14:11:03 +03:00 |
|
adel.kalimullin
|
99359431b9
|
SUPPORT-8937:add recruitment-sort for combik
|
2025-02-19 11:02:27 +03:00 |
|
Zaripov Emil
|
f2f913c74f
|
Merge branch 'develop' into hotfix/1.9.8
|
2025-02-18 22:05:53 +03:00 |
|
Zaripov Emil
|
53bc043dd8
|
Merge branch 'test' into release/ervu/1.9.8
|
2025-02-18 20:27:30 +03:00 |
|
Zaripov Emil
|
a5db47e2b7
|
Merge branch 'dev' into test
|
2025-02-18 20:26:00 +03:00 |
|
Zaripov Emil
|
d69082e8f2
|
SUPPORT-8912
|
2025-02-18 20:24:12 +03:00 |
|
Makarova Elena
|
546c0c4cd4
|
ERVU-273 доработка по региональным вк
|
2025-02-18 18:39:17 +03:00 |
|
Makarova Elena
|
cbb7f6cf2e
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8912_load_user_org' into develop
|
2025-02-18 17:54:02 +03:00 |
|
adel.kalimullin
|
8041c7619b
|
SUPPORT-8912:fixes
|
2025-02-18 17:28:54 +03:00 |
|
Zaripov Emil
|
c1b0df9099
|
Update README.md
|
2025-02-18 16:24:49 +03:00 |
|
hairullin@micord.ru
|
de5ca824be
|
Update README.md
|
2025-02-18 15:53:27 +03:00 |
|
adel.kalimullin
|
8cdbd44f64
|
SUPPORT-8912:fixes
|
2025-02-18 14:44:52 +03:00 |
|
adel.kalimullin
|
9b7e7fe543
|
SUPPORT-8912: fix from review
|
2025-02-18 14:25:13 +03:00 |
|
Zaripov Emil
|
dc73008755
|
dev conf
|
2025-02-18 14:00:48 +03:00 |
|
Zaripov Emil
|
fcc92e22d3
|
Merge branch 'test' into release/ervu/1.9.8
|
2025-02-18 13:50:24 +03:00 |
|
Zaripov Emil
|
4694291483
|
Merge branch 'dev' into test
|
2025-02-18 13:49:48 +03:00 |
|