Zaripov Emil
|
6cb5468097
|
set version 1.9.9-SNAPSHOT
|
2025-02-26 13:34:11 +03:00 |
|
Zaripov Emil
|
7bfcb9b5a0
|
Merge branch 'master' into develop
|
2025-02-26 13:33:13 +03:00 |
|
Zaripov Emil
|
2318a00116
|
Merge branch 'hotfix/1.9.8'
|
2025-02-26 13:26:00 +03:00 |
|
Zaripov Emil
|
5e3ee24c42
|
set version 1.9.8
|
2025-02-26 13:24:48 +03:00 |
|
Zaripov Emil
|
3808d1f58e
|
Merge branch 'develop' into hotfix/1.9.8
|
2025-02-26 13:23:51 +03:00 |
|
Makarova Elena
|
9554496a68
|
Merge remote-tracking branch 'origin/fix-pages' into develop
|
2025-02-26 12:49:44 +03:00 |
|
adel.kalimullin
|
e881aeab6b
|
fix
|
2025-02-26 12:38:11 +03:00 |
|
adel.kalimullin
|
9b8ad06a77
|
fix
|
2025-02-26 12:11:54 +03:00 |
|
adel.kalimullin
|
cbd8659acf
|
fix pages
|
2025-02-26 12:10:08 +03:00 |
|
Zaripov Emil
|
b87711ebcb
|
Merge remote-tracking branch 'origin/test/ERVU-290_with_ip_valid' into develop
|
2025-02-24 16:04:00 +03:00 |
|
Artyom Hackimullin
|
c88f42dacb
|
SUPPORT-8916: set custom compnent
|
2025-02-24 14:58:55 +03:00 |
|
Zaripov Emil
|
967e8bc708
|
set vrsion 1.9.9-SNAPSHOT
|
2025-02-24 14:42:08 +03:00 |
|
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 |
|
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 |
|
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 |
|
Zaripov Emil
|
b72dfc172d
|
Merge branch 'develop' into hotfix/1.9.8
|
2025-02-19 16:46:16 +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
|
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 |
|
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 |
|
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 |
|
adel.kalimullin
|
8927bcf124
|
SUPPORT-8912: add recruitment-loading
|
2025-02-18 12:03:28 +03:00 |
|
Zaripov Emil
|
eb8e6a40c3
|
set version 1.9.8-SNAPSHOT
|
2025-02-18 10:27:13 +03:00 |
|
Zaripov Emil
|
e82dd82866
|
Merge branch 'develop' into hotfix/1.9.8
|
2025-02-18 10:26:06 +03:00 |
|
Makarova Elena
|
7be14bb734
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-02-17 15:38:54 +03:00 |
|
Makarova Elena
|
cee5f876c1
|
ERVU-287 доработка форматов файлов и пф карточки
|
2025-02-17 15:35:54 +03:00 |
|
Булат Хайруллин
|
74afd3c769
|
fix
|
2025-02-12 12:47:05 +03:00 |
|
Makarova Elena
|
5c44b58f92
|
в гриде убрала колонку IP адрес
|
2025-02-12 11:14:20 +03:00 |
|
Makarova Elena
|
350ee84f69
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8909' into develop
|
2025-02-11 15:35:03 +03:00 |
|
ivanov.denis
|
d52e155afa
|
https://jira.micord.ru/browse/SUPPORT-8909
|
2025-02-11 15:10:24 +03:00 |
|
Makarova Elena
|
c9d24bf353
|
20250211_create_admin_user.xml
|
2025-02-11 13:33:54 +03:00 |
|
Makarova Elena
|
ff55f136ad
|
доработка по SUPPORT-8908
|
2025-02-11 10:43:55 +03:00 |
|
adel.ka
|
e5ff05d30a
|
Merge branch 'feature/SUPPORT-8908_fix_load_groups' into develop
|
2025-02-11 10:17:57 +03:00 |
|
Makarova Elena
|
55ba66fcf9
|
доработка по списку ip-адресов
|
2025-02-10 15:26:15 +03:00 |
|