Commit graph

986 commits

Author SHA1 Message Date
Халтобин Евгений
08572b35fa Merge remote-tracking branch 'origin/develop' into develop 2025-01-13 10:56:05 +03:00
Халтобин Евгений
cba7a9a32b update 2025-01-13 10:55:44 +03:00
Халтобин Евгений
f38dd1815c updated config 2025-01-13 10:55:13 +03:00
Eduard Tihomirov
d362df0e0e Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaTokensStore.java
#	backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/filter/JwtAuthenticationFilter.java
#	backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
#	backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/util/SecurityUtil.java
#	config/nginx.conf
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-01-10 13:03:38 +03:00
gulnaz
062e6c6e2d update config 2025-01-10 11:56:24 +03:00
Zaripov Emil
2be0b5a658 Merge branch 'hotfix/1.9.4'
# Conflicts:
#	backend/pom.xml
#	distribution/pom.xml
#	frontend/pom.xml
#	pom.xml
#	resources/pom.xml
2025-01-05 17:08:16 +03:00
Рауф Латыпов
c2ab31331a SUPPORT-8831: fix the method of filter existence (2) 2024-12-28 23:31:22 +03:00
Рауф Латыпов
1c357c97dc SUPPORT-8831: fix the method of filter existence 2024-12-28 16:05:52 +03:00
Eduard Tihomirov
8ed21d6e8b SUPPORT-8819: Fix 2024-12-28 15:02:49 +03:00
kochetkov
30e88b7f2e Merge branch 'hotfix/1.9.4' of 10.10.31.70:/ervu-lkrp-ul into hotfix/1.9.4 2024-12-27 20:52:04 +03:00
kochetkov
d45d25baaf SUPPORT-8830 fixes 2024-12-27 19:47:47 +03:00
Рауф Латыпов
52f5026649 SUPPORT-8831: button enable changed to visible 2024-12-27 17:42:26 +03:00
Рауф Латыпов
61a2c3b5e3 SUPPORT-8831: fix the ACes 2024-12-27 15:57:31 +03:00
Рауф Латыпов
dabc1a9ec9 SUPPORT-8831: fix for review (1) 2024-12-27 12:41:47 +03:00
Рауф Латыпов
b9ca2b5aba SUPPORT-8831: add grid columns filters changed event
+ AC for button visibility
2024-12-27 10:59:13 +03:00
Zaripov Emil
aa945103c2 Merge branch 'hotfix/1.9.3' 2024-12-26 11:00:56 +03:00
Zaripov Emil
5d78f06673 set version 1.9.4-SNAPSHOT 2024-12-26 10:56:59 +03:00
Eduard Tihomirov
21ad3e9192 SUPPORT-8755: Fix 2024-12-26 10:23:29 +03:00
Eduard Tihomirov
3c4ea9b3dd fix 2024-12-25 16:48:05 +03:00
Eduard Tihomirov
f671dfa194 SUPPORT-8755: Fix 2024-12-25 12:45:54 +03:00
Eduard Tihomirov
f550484586 SUPPORT-8755: Fix 2024-12-25 10:39:36 +03:00
Eduard Tihomirov
2896078876 SUPPORT-8755: Fix 2024-12-24 20:45:05 +03:00
Eduard Tihomirov
e7c23ff3a1 SUPPORT-8755: Fix 2024-12-24 20:29:01 +03:00
Eduard Tihomirov
1059730066 SUPPORT-8755: Fix 2024-12-24 20:26:13 +03:00
Eduard Tihomirov
9cd29fc335 SUPPORT-8755: Fix 2024-12-24 20:09:17 +03:00
Халтобин Евгений
f4fe33e27f added cache 2024-12-24 14:27:53 +03:00
Zaripov Emil
60615ff8ea fix 2024-12-24 11:26:40 +03:00
Халтобин Евгений
18df83f0e2 DEVOPS-1892: added cache settings
moved from angie to nginx
2024-12-23 10:14:02 +03:00
Халтобин Евгений
bd3f7cb695 DEVOPS-1892: added cache settings
moved from angie to nginx
2024-12-23 10:13:42 +03:00
Zaripov Emil
6ac3e224a2 Merge branch 'master' into develop 2024-12-23 10:08:05 +03:00
Zaripov Emil
529e70bb5c set version 1.9.2 2024-12-23 10:03:42 +03:00
Zaripov Emil
6965775ad3 set version 1.9.3-SNAPSHOT 2024-12-23 10:02:17 +03:00
Zaripov Emil
38ded67b18 Merge branch 'hotfix/1.9.2' 2024-12-23 09:59:41 +03:00
Zaripov Emil
9eb5b55e35 fix 2024-12-20 21:50:09 +03:00
Zaripov Emil
82e318b768 fix file names 2024-12-20 18:40:00 +03:00
m.epshtein
1f682a38cd Merge branch 'hotfix/1.9.2' of 10.10.31.70:/ervu-lkrp-ul into hotfix/1.9.2 2024-12-20 17:18:09 +03:00
m.epshtein
a4027f82de new imgs 2024-12-20 17:17:55 +03:00
r.gaztdinov
81b2dc5b85 + 2024-12-20 16:47:51 +03:00
Zaripov Emil
0fda2d96fb fix home.html 2024-12-20 16:06:19 +03:00
adel.kalimullin
96254d18e8 SUPPORT-8788: fix auth-guard 2024-12-18 14:49:52 +03:00
Eduard Tihomirov
848d9adcb1 fix home.html 2024-12-18 14:48:58 +03:00
Рауф Латыпов
9a9b2ed85e SUPPORT-8797: hide HB container with 2 fields 2024-12-18 14:48:44 +03:00
m.epshtein
89401f874a change title 2024-12-16 12:03:56 +03:00
adel.kalimullin
82031940b7 SUPPORT-8725:fix from review 2024-12-13 14:19:19 +03:00
adel.kalimullin
6f5dbf42c9 SUPPORT-8706: fix 2024-12-13 11:47:10 +03:00
adel.kalimullin
2b4a184a8b SUPPORT-8725: add own exception 2024-12-12 13:22:32 +03:00
adel.kalimullin
cdcc83123c SUPPORT-8725: set camelCase naming 2024-12-11 11:33:26 +03:00
adel.kalimullin
f7c528ab90 SUPPORT-8725: update logger naming 2024-12-11 11:03:26 +03:00
kochetkov
3f2711a74e SUPPORT-8774 update kafka-clients 2024-12-10 15:04:59 +03:00
Zaripov Emil
7dec9acd5b Merge branch 'master' into develop 2024-12-09 14:08:23 +03:00