Халтобин Евгений
|
b87b35a81e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-01-15 14:04:08 +03:00 |
|
Халтобин Евгений
|
f83e3a7582
|
fix
|
2025-01-15 14:03:41 +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 |
|
kochetkov
|
c17be4426f
|
Merge branch 'feature/SUPPORT-8838_fixes' into hotfix/1.9.5
|
2025-01-15 10:11:55 +03:00 |
|
kochetkov
|
c06b9267ef
|
SUPPORT-8838 fix version
|
2025-01-15 10:11:40 +03:00 |
|
Халтобин Евгений
|
c3c4c22d8d
|
fixed schedule lock in webdav service
|
2025-01-15 08:43:19 +03:00 |
|
Artyom Hackimullin
|
518796e74b
|
SUPPORT-8842: fix
|
2025-01-14 17:28:06 +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 |
|
Artyom Hackimullin
|
d0155a88da
|
SUPPORT-8842: test(3)
|
2025-01-14 15:34:16 +03:00 |
|
kochetkov
|
e2ce54daaf
|
SUPPORT-8774 update kafka-clients (from develop)
|
2025-01-14 15:23:46 +03:00 |
|
kochetkov
|
2bbf267c07
|
SUPPORT-8774 update kafka-clients (from develop)
|
2025-01-14 15:15:42 +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 |
|
Pavel Zilke
|
45f7e2db8b
|
DEVOPS-1892 nginx.conf grooming
|
2025-01-14 10:25:30 +03:00 |
|
kochetkov
|
db7f6bee97
|
some nginx conf from rtsk sources
|
2025-01-14 10:07:15 +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
|
3b230940b5
|
update platform and package to 3.187.1
|
2025-01-13 12:26:11 +03:00 |
|
Халтобин Евгений
|
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 |
|
kochetkov
|
3250835541
|
make errors json format
|
2025-01-13 09:59:51 +03:00 |
|
kochetkov
|
c3435cf8f3
|
add pure tomcat server.xml
|
2025-01-13 09:58:57 +03:00 |
|
kochetkov
|
6bafc588d1
|
SUPPORT-8838 fixes
|
2025-01-13 09:21:28 +03:00 |
|
kochetkov
|
992bbee373
|
SUPPORT-8830 fix
|
2025-01-10 16:42:21 +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 |
|
gulnaz
|
062e6c6e2d
|
update config
|
2025-01-10 11:56:24 +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 |
|
Рауф Латыпов
|
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 |
|