Eduard Tihomirov
|
fcae74e20e
|
add marker ver
|
2025-04-11 15:15:30 +03:00 |
|
gulnaz
|
a17c129eb5
|
Merge branch 'develop' into feature/SUPPORT-8749_fix_config
# Conflicts:
# config/micord.env
|
2025-03-04 10:26:22 +03:00 |
|
Eduard Tihomirov
|
93ab3255cb
|
Merge branch 'feature/SUPPORT-8942_fix' into develop
|
2025-02-27 11:18:08 +03:00 |
|
Eduard Tihomirov
|
51c3f18824
|
SUPPORT-8942: Fix
|
2025-02-26 14:09:58 +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 |
|
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 |
|
gulnaz
|
7e59789449
|
SUPPORT-8749: rename common kafka env vars
|
2025-01-29 18:23:56 +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 |
|
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 |
|
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 |
|
Халтобин Евгений
|
08572b35fa
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-01-13 10:56:05 +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 |
|
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 |
|