Commit graph

651 commits

Author SHA1 Message Date
Халтобин Евгений
83af6ad8c2 Merge remote-tracking branch 'origin/feature/SUPPORT-8438_reopen' into develop 2024-10-11 08:00:47 +03:00
Халтобин Евгений
e01bda3073 updated war plugin 2024-10-10 09:12:23 +03:00
Makarova Elena
b133940b0d height=100% 2024-10-03 12:56:14 +03:00
Zaripov Emil
f254dd804b Merge remote-tracking branch 'origin/test/tmp_develop_2' into develop 2024-10-01 22:32:50 +03:00
m.epshtein
fe83e89b23 Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop 2024-10-01 13:44:48 +03:00
m.epshtein
c1b3985d8b change title 2024-10-01 13:44:30 +03:00
ivanov.denis
3d89fb5780 SUPPORT-8438 2024-10-01 11:01:53 +03:00
Халтобин Евгений
e906399993 removed ervu profile 2024-10-01 08:43:13 +03:00
Халтобин Евгений
d0e89dd23c Merge branch 'release/1.0.0' into develop 2024-10-01 08:40:21 +03:00
Халтобин Евгений
f6a0a9fbe6 removed tests 2024-10-01 08:31:50 +03:00
Халтобин Евгений
9474cf4c17 Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0 2024-09-30 22:17:43 +03:00
Халтобин Евгений
dbba440a08 fixed pom 2024-09-30 17:47:43 +03:00
gulnaz
a07469d859 hide some rules 2024-09-30 17:31:19 +03:00
gulnaz
78d91f2dcc fix StaticColumnInitializer 2024-09-30 17:18:21 +03:00
m.epshtein
262a3d14a6 // 2024-09-30 16:23:13 +03:00
gulnaz
32910508ef use cookie for journal request 2024-09-30 16:14:02 +03:00
m.epshtein
92c8c67563 Merge branch 'test/tmp_develop_2' of 10.10.31.70:/ervu-lkrp-ul into test/tmp_develop_2 2024-09-30 16:13:38 +03:00
gulnaz
519b5b6b39 Merge branch 'release/1.0.0' of 10.10.31.70:/ervu-lkrp-ul into release/1.0.0 2024-09-30 16:13:37 +03:00
gulnaz
b8bf891081 fix setting security context 2024-09-30 16:13:32 +03:00
m.epshtein
a526a9fd23 // 2024-09-30 16:12:58 +03:00
Халтобин Евгений
cec5a1af0f Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0 2024-09-30 15:56:14 +03:00
Makarova Elena
7ff10a29fa floatingFilter = false 2024-09-30 15:54:13 +03:00
ivanov.denis
bf87c0c69b Merge branch 'release/1.0.0' into feature/SUPPORT-8438_reopen 2024-09-30 15:45:32 +03:00
Халтобин Евгений
0f15a35cbb added ervu profile 2024-09-30 15:44:33 +03:00
Makarova Elena
b8af9f04ec Merge branch 'test/tmp_develop_2' of 10.10.31.70:/ervu-lkrp-ul into test/tmp_develop_2 2024-09-30 15:36:58 +03:00
Makarova Elena
27a9103513 фильтр проставила 2024-09-30 15:36:48 +03:00
m.epshtein
a359382e96 +logo 2024-09-30 15:36:34 +03:00
m.epshtein
38b44485ec +logo 2024-09-30 15:34:29 +03:00
ivanov.denis
6866bacf52 ? 2024-09-30 15:34:19 +03:00
m.epshtein
1d02d62fb7 show filter-button 2024-09-30 15:01:58 +03:00
Makarova Elena
0405046fae package-lock.json 2024-09-30 14:36:36 +03:00
Makarova Elena
75df543be7 Merge remote-tracking branch 'origin/update/3.181.2' into test/tmp_develop_2 2024-09-30 14:02:37 +03:00
Eduard Tihomirov
d7ad12ea94 Fix download button 2024-09-30 13:05:45 +03:00
ivanov.denis
e19bc2d877 release 3.181.2 2024-09-30 12:54:24 +03:00
Eduard Tihomirov
9d1d5ad1d1 Merge remote-tracking branch 'origin/release/1.0.0' into release/1.0.0 2024-09-30 11:22:46 +03:00
Eduard Tihomirov
146fe46638 Fix auth 2024-09-30 11:21:57 +03:00
Халтобин Евгений
f8d280665e SUPPORT-8576 fixed file upload error 2024-09-30 11:08:07 +03:00
Makarova Elena
2d8ea9dce9 удалила VB4 с 2-мя гридами -основной вид деятельности и дополнительный вид деятельности 2024-09-29 16:22:18 +03:00
Makarova Elena
97a2d5b1c9 удалила VB4 с 2-мя гридами -основной вид деятельности и дополнительный вид деятельности 2024-09-29 16:16:58 +03:00
gulnaz
f936b74328 fix response dto 2024-09-29 14:09:09 +03:00
gulnaz
1219c9fdf5 use kafkaTemplate 2024-09-29 13:13:07 +03:00
gulnaz
20342157c0 add interceptor, fix messageId 2024-09-29 00:43:01 +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
Zaripov Emil
27d3863380 Revert "fix"
This reverts commit 79e82a82ba.
2024-09-27 17:52:55 +03:00
Zaripov Emil
79e82a82ba fix 2024-09-27 15:39:36 +03:00
Eduard Tihomirov
7b2998ed5f test 2024-09-27 12:34:28 +03:00
Zaripov Emil
e7cd48e969 Merge branch 'master' into develop 2024-09-27 12:22:44 +03:00
Zaripov Emil
4cb312d58e Merge branch 'release/1.0.0' 2024-09-27 12:21:55 +03:00
Халтобин Евгений
18104dd600 restored doc 2024-09-26 14:10:08 +03:00