Commit graph

74 commits

Author SHA1 Message Date
Eduard Tihomirov
583bba3c66 return 2025-09-09 13:17:52 +03:00
Eduard Tihomirov
7153e347eb SUPPORT-9339: fix 2025-09-08 15:31:43 +03:00
Eduard Tihomirov
22ffb8a866 SUPPORT-9339: Add sign verify 2025-09-04 10:19:01 +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
be04288309 SUPPORT-8942: Fix 2025-02-26 12:43:59 +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
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
2aead95668 update esnsi okopf 2025-01-23 12:36:15 +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
317f681ada SUPPORT-8842: test(1) 2025-01-14 14:47:46 +03:00
gulnaz
062e6c6e2d update config 2025-01-10 11:56:24 +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
4fdb02b696 SUPPORT-8689: fix(2) add config retry load 2024-11-12 10:31:27 +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
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
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
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
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
Eduard Tihomirov
a24052770e SUPPORT-8458: Fix 2024-09-24 12:30:46 +03:00
gulnaz
8b3e0f9b31 SUPPORT-8558: rename av topic 2024-09-24 11:46:36 +03:00
gulnaz
1d0c95be13 change esia certificate hash param name 2024-09-23 11:25:37 +03:00
gulnaz
ef02a774d4 SUPPORT-8553: fix properties 2024-09-19 10:31:54 +03:00
gulnaz
79833feb75 Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/patches/default.cli
#	config/standalone/dev/standalone.xml
#	frontend/src/resources/app-config.json
#	resources/src/main/resources/business-model/Журнал взаимодействия.page
2024-09-13 17:12:11 +03:00
Eduard Tihomirov
5c4825f42c Fix 2024-09-13 15:34:51 +03:00
Eduard Tihomirov
4891c16316 Merge remote-tracking branch 'origin/feature/SUPPORT-8471_fix_load_okopf' into release/1.0.0
# Conflicts:
#	backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/InteractionLog.java
#	backend/src/main/java/ervu_lkrp_ul/ervu_lkrp_ul/db_beans/public_/tables/records/InteractionLogRecord.java
#	backend/src/main/resources/config/v_1.0/changelog-v_1.0.xml
#	config/patches/default.cli
#	config/standalone/dev/standalone.xml
2024-09-13 14:57:11 +03:00
gulnaz
d94e45c970 Merge branch 'feature/SUPPORT-8470_status' into feature/SUPPORT-8411_fixed
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
2024-09-13 13:01:22 +03:00
Eduard Tihomirov
8dba0d4316 Merge branch 'feature/SUPPORT-8474_id_ervu' into feature/SUPPORT-8470_status 2024-09-13 10:07:26 +03:00
gulnaz
e1c3cc3eb6 Merge branch 'feature/SUPPORT-8474_id_ervu' into feature/SUPPORT-8411_fixed
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/kafka/service/impl/BaseReplyingKafkaServiceImpl.java
#	frontend/src/resources/app-config.json
2024-09-13 10:05:28 +03:00
Eduard Tihomirov
142e501906 Merge branch 'feature/SUPPORT-8471_load_classifier' into feature/SUPPORT-8474_id_ervu
# Conflicts:
#	backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
#	config/standalone/dev/standalone.xml
2024-09-13 09:52:03 +03:00
Eduard Tihomirov
19486d381a Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8471_load_classifier 2024-09-13 09:41:46 +03:00
Eduard Tihomirov
1fbb464e3b SUPPORT-8427: Fix 2024-09-12 16:40:20 +03:00
Eduard Tihomirov
3d7e8dcc68 SUPPORT-8474: Fix 2024-09-12 15:34:17 +03:00