Commit graph

697 commits

Author SHA1 Message Date
gulnaz
53b9ae4d9d fix 2025-01-15 16:31:00 +03:00
gulnaz
2161ab9b8d move exception 2025-01-15 16:30:08 +03:00
gulnaz
c86896109f apply changes from hotfix 2025-01-15 16:19:01 +03:00
gulnaz
be13a4f64b apply changes from develop 2025-01-15 16:08:26 +03:00
gulnaz
58e5b4789e use different WebDAV urls 2025-01-15 15:52:03 +03:00
kochetkov
fe42948496 Merge branch 'hotfix/1.9.5' into develop
# Conflicts:
#	backend/pom.xml
#	backend/src/main/java/ervu/controller/EmployeeInfoFileUploadController.java
#	backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.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-15 13:31:11 +03:00
Халтобин Евгений
c3c4c22d8d fixed schedule lock in webdav service 2025-01-15 08:43:19 +03:00
Eduard Tihomirov
f44dad90a5 Merge branch 'feature/SUPPORT-8845_fix_logout' into hotfix/1.9.5
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/util/SecurityUtil.java
2025-01-14 15:57:10 +03:00
Eduard Tihomirov
c257e08522 SUPPORT-8845: Fix 2025-01-14 15:50:40 +03:00
kochetkov
e2ce54daaf SUPPORT-8774 update kafka-clients (from develop) 2025-01-14 15:23:46 +03:00
Artyom Hackimullin
7ad36c6780 SUPPORT-8842: test(2) 2025-01-14 14:55:50 +03:00
Artyom Hackimullin
317f681ada SUPPORT-8842: test(1) 2025-01-14 14:47:46 +03:00
kochetkov
26dd069a36 remove unnecessary call to authmanager 2025-01-14 13:19:04 +03:00
Eduard Tihomirov
0cf2336836 SUPPORT-8845: Fix 2025-01-14 12:50:16 +03:00
Eduard Tihomirov
55f87746ad fix 2025-01-14 11:30:23 +03:00
kochetkov
2df376e075 SUPPORT-8838 fixes 2025-01-13 13:36:20 +03:00
kochetkov
5581603019 SUPPORT-8838 fixes 2025-01-13 13:14:20 +03:00
kochetkov
6bafc588d1 SUPPORT-8838 fixes 2025-01-13 09:21:28 +03:00
kochetkov
ad12383d0d SUPPORT-8838 fixes 2025-01-10 15:25:00 +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
Eduard Tihomirov
ec97d65dfb SUPPORT-8845: Fix 2025-01-09 16:32:07 +03:00
Eduard Tihomirov
7663a3c685 Cherry pick SUPPORT-8682 2025-01-09 15:50:29 +03:00
Zaripov Emil
1face050c5 set version 1.9.5-SNAPSHOT 2025-01-05 17:10:43 +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
kochetkov
d45d25baaf SUPPORT-8830 fixes 2024-12-27 19:47:47 +03:00
Eduard Tihomirov
5da710ee95 SUPPORT-8822: Fix 2024-12-26 14:21:59 +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
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
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
gulnaz
9b8447c3e9 SUPPORT-8666: use different WebDAV urls 2024-12-05 17:08:37 +03:00
gulnaz
e42d07ad74 fix condition in authentication filter 2024-12-03 10:30:07 +03:00
Zaripov Emil
6f947a1cca Merge branch 'master' into hotfix/1.9.2 2024-12-03 09:16:05 +03:00
Zaripov Emil
a13035b043 Merge branch 'master' into develop
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
2024-12-03 09:10:11 +03:00
Zaripov Emil
4c197987a8 Merge branch 'hotfix/1.9.1' 2024-12-03 09:04:57 +03:00
Eduard Tihomirov
a83c461ddb Merge branch 'feature/SUPPORT-8571_check_browser' into develop 2024-11-29 13:11:51 +03:00