Commit graph

129 commits

Author SHA1 Message Date
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
Халтобин Евгений
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
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
gulnaz
e6bc31f4c2 add job for WebDAV cleanup 2024-11-07 10:28:56 +03:00
gulnaz
b622444b3c add job for WebDAV cleanup 2024-11-05 16:31:51 +03:00
Eduard Tihomirov
9949276f0e Merge branch 'feature/SUPPORT-8660_fix_upload_file' into hotfix/1.9.1 2024-11-05 10:25:26 +03:00
Zaripov Emil
a519b42a46 fix by artyom h 2024-11-02 18:16:55 +03:00
Eduard Tihomirov
4de1aa69d1 SUPPORT-8660: Fix 2024-10-31 09:53:26 +03:00
Eduard Tihomirov
fee416c1dd Merge branch 'hotfix/1.8.2' into feature/SUPPORT-8593_marker_verify
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/standalone/dev/standalone.xml
2024-10-25 11:57:45 +03:00
Халтобин Евгений
031617b4c2 fix 2024-10-24 09:18:15 +03:00
Eduard Tihomirov
3059b797df Merge branch 'hotfix/1.8.2' into feature/SUPPORT-8579_access_marker
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/standalone/dev/standalone.xml
2024-10-23 14:45:41 +03:00
Халтобин Евгений
311e1583d1 removed old props 2024-10-23 10:31:51 +03:00
Халтобин Евгений
474ad39775 update env file 2024-10-21 08:58:25 +03:00
Eduard Tihomirov
09b850df49 fix upload data role 2024-10-15 14:47:55 +03:00
Eduard Tihomirov
b6d1c9720c Merge remote-tracking branch 'origin/master' into feature/SUPPORT-8579_access_marker
# Conflicts:
#	backend/src/main/java/ervu/controller/EmployeeInfoFileUploadController.java
#	backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
#	config/standalone/dev/standalone.xml
2024-10-11 10:32:02 +03:00
Eduard Tihomirov
c9a1e24c4b SUPPORT-8593: Fix 2024-10-09 07:51:33 +03:00
Eduard Tihomirov
2c2ff8680a SUPPORT-8579: Fix 2024-10-03 16:26:46 +03:00
gulnaz
e03f255df3 SUPPORT-8583: exclude some file statuses 2024-10-03 11:59:26 +03:00
Халтобин Евгений
8b7a8845f5 Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0 2024-10-01 11:13:42 +03:00
Eduard Tihomirov
365e5e4b7d SUPPORT-8556: Fix 2024-10-01 10:59:53 +03:00
Eduard Tihomirov
323b27be12 Merge remote-tracking branch 'origin/release/1.0.0' into feature/SUPPORT-8556_fix 2024-10-01 09:49:35 +03:00
ivanov.denis
e7d83594c6 SUPPORT-8438 import fix 2024-09-30 18:15:49 +03:00
ivanov.denis
f21375bcc7 SUPPORT-8438 val fix 2024-09-30 17:13:07 +03:00
ivanov.denis
6866bacf52 ? 2024-09-30 15:34:19 +03:00
Pavel Zilke
be6c1aef93 fix ervu kafka bootstrap servers 2024-09-28 19:17:32 +03:00
gulnaz
89326bd0b9 rename s3 props; add s3 env vars 2024-09-28 10:45:20 +03:00
Eduard Tihomirov
723a4b9654 SUPPORT-8556: Fix 2024-09-26 14:10:57 +03:00
Eduard Tihomirov
371cffabbd Merge branch 'feature/SUPPORT-8458_file' into release/1.0.0 2024-09-26 10:50:37 +03:00
gulnaz
30e7e1b2bd rename kafka url prop 2024-09-24 16:36:29 +03:00
gulnaz
bd4cc9d4ea rename props 2024-09-24 16:30:38 +03:00