Commit graph

1036 commits

Author SHA1 Message Date
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
m.epshtein
b4a2d44dec SUPPORT-8947 fix component 2025-02-26 11:41:33 +03:00
adel.kalimullin
6a6d3af94e SUPPORT-8956: front mfe 2025-02-26 09:49:31 +03:00
adel.kalimullin
c52a094e96 SUPPORT-8956: delete auth-components 2025-02-26 09:40:35 +03:00
Zaripov Emil
b03c33de46 Merge branch 'test' into release/ervu/1.9.8 2025-02-26 09:27:49 +03:00
m.epshtein
6ab6ab234c SUPPORT-8947 v1.0 2025-02-25 17:32:13 +03:00
adel.kalimullin
4b8dce7f30 SUPPORT-8956: add security-backend(jwt...) 2025-02-25 17:31:08 +03:00
m.epshtein
34781303f7 SUPPORT-8947 v0.3 2025-02-25 16:18:24 +03:00
Zaripov Emil
b172c7ec7a Merge branch 'develop' into hotfix/1.9.9 2025-02-25 15:41:44 +03:00
m.epshtein
0e081146ec SUPPORT-8947 v0.2 2025-02-25 11:32:36 +03:00
m.epshtein
80021d1ba0 SUPPORT-8947 v0.1 2025-02-25 10:04:13 +03:00
Zaripov Emil
3d30c53439 set version 1.9.9 2025-02-24 17:37:21 +03:00
Zaripov Emil
773069bcc5 Merge branch 'dev' into test 2025-02-24 17:36:39 +03:00
Zaripov Emil
7cf2134f26 sync 2025-02-24 17:33:42 +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
adel.kalimullin
328849dde4 SUPPORT-8938: fix 2025-02-24 15:52:49 +03:00
Artyom Hackimullin
c88f42dacb SUPPORT-8916: set custom compnent 2025-02-24 14:58:55 +03:00
Zaripov Emil
40aeb2a96b set vrsion 1.9.9-SNAPSHOT 2025-02-24 14:42:45 +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
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