Eduard Tihomirov
|
4feee469ac
|
fix cron
|
2025-02-26 14:35:19 +03:00 |
|
gulnaz
|
cabde7f04d
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ru/micord/ervu/kafka/controller/ErvuKafkaController.java
# backend/src/main/java/ru/micord/ervu/kafka/exception/ExcerptException.java
# backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaServiceImpl.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-02-24 16:33:50 +03:00 |
|
Халтобин Евгений
|
16531e0dea
|
updated nginx image
|
2025-02-17 09:01:35 +03:00 |
|
Eduard Tihomirov
|
f7e168f80c
|
Merge branch 'master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# config/micord.env
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-02-03 13:54:09 +03:00 |
|
adel.kalimullin
|
2f7328d6fb
|
SUPPORT-8706: add audit
|
2025-01-29 14:46:49 +03:00 |
|
Artyom Hackimullin
|
294a2959db
|
fix
|
2025-01-28 13:19:54 +03:00 |
|
Artyom Hackimullin
|
cd5890bf5d
|
commit(2)
|
2025-01-28 10:05:22 +03:00 |
|
Artyom Hackimullin
|
fd91913d77
|
commit(1)
|
2025-01-28 10:02:07 +03:00 |
|
Artyom Hackimullin
|
e6df3fcac2
|
commit(1)
|
2025-01-28 09:54:44 +03:00 |
|
Emir Suleimanov
|
07ec1d2d14
|
SUPPORT-8884: add time process the requests for access.log
|
2025-01-27 14:03:50 +03:00 |
|
Халтобин Евгений
|
522ef07ff0
|
DEVOPS-1898 fixes from Pavel
|
2025-01-24 14:21:38 +03:00 |
|
Халтобин Евгений
|
44f9351cde
|
DEVOPS-1898 fixes from Pavel
|
2025-01-24 14:07:15 +03:00 |
|
Artyom Hackimullin
|
2aead95668
|
update esnsi okopf
|
2025-01-23 12:36:15 +03:00 |
|
Artyom Hackimullin
|
1130a5addd
|
SUPPORT-8863: revert micord.env
|
2025-01-21 09:52:27 +03:00 |
|
Artyom Hackimullin
|
108ec97ca6
|
SUPPORT-8863: test(3)
|
2025-01-20 16:28:54 +03:00 |
|
Artyom Hackimullin
|
ea090e14c5
|
SUPPORT-8863: test(2)
|
2025-01-20 16:19:38 +03:00 |
|
Artyom Hackimullin
|
1710a75da3
|
SUPPORT-8863: test(1)
|
2025-01-20 15:59:17 +03:00 |
|
Artyom Hackimullin
|
18ae53b069
|
SUPPORT-8863: fix
|
2025-01-18 20:25:08 +03:00 |
|
Artyom Hackimullin
|
0f1446ffbf
|
SUPPORT-8863: update
|
2025-01-18 20:25:07 +03:00 |
|
gulnaz
|
58e5b4789e
|
use different WebDAV urls
|
2025-01-15 15:52:03 +03:00 |
|
Халтобин Евгений
|
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 |
|
Artyom Hackimullin
|
518796e74b
|
SUPPORT-8842: fix
|
2025-01-14 17:28:06 +03:00 |
|
Artyom Hackimullin
|
d0155a88da
|
SUPPORT-8842: test(3)
|
2025-01-14 15:34:16 +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 |
|
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 |
|
Халтобин Евгений
|
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 |
|
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 |
|
kochetkov
|
d45d25baaf
|
SUPPORT-8830 fixes
|
2024-12-27 19:47:47 +03:00 |
|
Халтобин Евгений
|
f4fe33e27f
|
added cache
|
2024-12-24 14:27:53 +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 |
|
Халтобин Евгений
|
d14fed1384
|
Merge branch 'feature/docker-compose' into develop
|
2024-12-04 10:59:20 +03:00 |
|
Халтобин Евгений
|
74a1d200a1
|
added props
|
2024-12-04 10:59:08 +03:00 |
|
Халтобин Евгений
|
6040280daa
|
added docker compose
|
2024-12-01 22:52:43 +03:00 |
|
Eduard Tihomirov
|
bdad3a161d
|
Merge branch 'develop' into feature/SUPPORT-8593_marker_verify
|
2024-11-26 16:10:01 +03:00 |
|
Eduard Tihomirov
|
7d11d5b500
|
fix token verify
(cherry picked from commit 4735c39b8d52d49e136e5f1c48680f953fd0e57a)
|
2024-11-19 13:57:08 +03:00 |
|
Artyom Hackimullin
|
e4a890b7b4
|
Merge branch 'feature/SUPPORT-8689_fix_esnsi_okopf' into develop
# Conflicts:
# backend/pom.xml
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2024-11-14 16:13:06 +03:00 |
|
Artyom Hackimullin
|
4fdb02b696
|
SUPPORT-8689: fix(2) add config retry load
|
2024-11-12 10:31:27 +03:00 |
|
Халтобин Евгений
|
530830e2fe
|
removed property
|
2024-11-08 15:26:22 +03:00 |
|
Zaripov Emil
|
27b42e9b0b
|
set DB_APP_NAME=ervu_lkrp_ul
|
2024-11-08 15:14:52 +03:00 |
|
kochetkov
|
235806a4f1
|
fix db names
|
2024-11-08 15:09:52 +03:00 |
|