Zaripov Emil
|
56117df1e2
|
Merge remote-tracking branch 'origin/develop' into release/1.0.0
|
2024-09-13 14:56:43 +03:00 |
|
m.epshtein
|
ab3b28a02a
|
grid-v2 flex
|
2024-09-13 14:53:31 +03:00 |
|
m.epshtein
|
b8c4b5cafe
|
scroll fix
|
2024-09-13 14:45:06 +03:00 |
|
gulnaz
|
19c4faaba1
|
SUPPORT-8411: add sorting
|
2024-09-13 14:43:05 +03:00 |
|
gulnaz
|
a01acaf1b9
|
SUPPORT-8411: fix formatter
|
2024-09-13 14:42:18 +03:00 |
|
gulnaz
|
e5ce54655b
|
SUPPORT-8411: remove redundant code
|
2024-09-13 14:37:03 +03:00 |
|
gulnaz
|
6ca54eb670
|
SUPPORT-8411: check for length
|
2024-09-13 14:32:42 +03:00 |
|
m.epshtein
|
9ac8984490
|
Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop
|
2024-09-13 14:31:37 +03:00 |
|
m.epshtein
|
c0e133593b
|
journal grid
|
2024-09-13 14:31:27 +03:00 |
|
Makarova Elena
|
3771db8f7f
|
Merge branch 'grid_mila' into develop
|
2024-09-13 14:31:15 +03:00 |
|
Makarova Elena
|
8441b5d194
|
Merge remote-tracking branch 'origin/develop' into grid_mila
|
2024-09-13 14:30:31 +03:00 |
|
Zaripov Emil
|
1a6038a754
|
Merge remote-tracking branch 'origin/develop' into release/1.0.0
|
2024-09-13 14:25:23 +03:00 |
|
m.epshtein
|
eb19fd054e
|
fix footer
|
2024-09-13 14:16:09 +03:00 |
|
gulnaz
|
ecd9167c0f
|
SUPPORT-8411: return canActivate
|
2024-09-13 14:06:54 +03:00 |
|
Zaripov Emil
|
95d8fa9d13
|
Merge remote-tracking branch 'origin/develop' into release/1.0.0
|
2024-09-13 14:03:52 +03:00 |
|
gulnaz
|
d23a5644c1
|
SUPPORT-8411: revert some changes
|
2024-09-13 14:03:52 +03:00 |
|
gulnaz
|
7398103f24
|
SUPPORT-8411: fix after merge; fetch logs from db; add excluded statuses property;
|
2024-09-13 14:02:29 +03:00 |
|
Makarova Elena
|
ab7aa1fc1e
|
перенос строки в гриде
|
2024-09-13 13:49:29 +03:00 |
|
m.epshtein
|
5d34476701
|
dynamic footer
|
2024-09-13 13:47:58 +03:00 |
|
Хакимуллин Артём
|
82cd8892a0
|
SUPPORT-8471: renames okpf dao and service
|
2024-09-13 13:15:47 +03:00 |
|
Хакимуллин Артём
|
ae1b188114
|
SUPPORT-8471: new changes
|
2024-09-13 13:10:26 +03:00 |
|
Eduard Tihomirov
|
600be7d5d9
|
Merge branch 'feature/SUPPORT-8470_status' into release/1.0.0
|
2024-09-13 13:10:08 +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 |
|
gulnaz
|
d8d60b5817
|
SUPPORT-8411: change package; fix page and scripts
|
2024-09-13 12:43:17 +03:00 |
|
Makarova Elena
|
d06e1bc10b
|
Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop
|
2024-09-13 12:37:12 +03:00 |
|
Makarova Elena
|
6e741860d1
|
убрала класс у красной кнопки
|
2024-09-13 12:37:03 +03:00 |
|
Eduard Tihomirov
|
c6b9815947
|
SUPPORT-8470: Fix
|
2024-09-13 12:16:30 +03:00 |
|
Eduard Tihomirov
|
a494f43555
|
SUPPORT-8470: Add ervuId
|
2024-09-13 12:16:11 +03:00 |
|
m.epshtein
|
0c777a44e5
|
Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop
|
2024-09-13 12:09:05 +03:00 |
|
m.epshtein
|
c6c8f03e3e
|
hide filter-button
|
2024-09-13 12:08:47 +03:00 |
|
gulnaz
|
14f9bf2233
|
Merge branch 'feature/SUPPORT-8474_id_ervu' into feature/SUPPORT-8411_fixed
|
2024-09-13 11:17:02 +03:00 |
|
gulnaz
|
0008e1e3b9
|
revert
|
2024-09-13 11:13:32 +03:00 |
|
Eduard Tihomirov
|
c2f278c6cd
|
Merge branch 'feature/SUPPORT-8474_id_ervu' into feature/SUPPORT-8470_status
|
2024-09-13 11:06:25 +03:00 |
|
Eduard Tihomirov
|
ea36487cd7
|
Merge branch 'feature/SUPPORT-8474_id_ervu' into release/1.0.0
|
2024-09-13 10:56:39 +03:00 |
|
Eduard Tihomirov
|
e21b8497f5
|
Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu
|
2024-09-13 10:39:47 +03:00 |
|
Eduard Tihomirov
|
3d55523696
|
SUPPORT-8427: Fix
|
2024-09-13 10:37:19 +03:00 |
|
Eduard Tihomirov
|
2a4e3bea71
|
SUPPORT-8470: Fix
|
2024-09-13 10:19:27 +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 |
|
Makarova Elena
|
e55f55342f
|
ERVU-136
|
2024-09-13 09:28:33 +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 |
|
Eduard Tihomirov
|
12a498f210
|
SUPPORT-8474: Fix
|
2024-09-12 15:17:33 +03:00 |
|
Eduard Tihomirov
|
e977eb2bfe
|
SUPPORT-8427: Fix
|
2024-09-12 14:51:21 +03:00 |
|
Eduard Tihomirov
|
5da678d304
|
SUPPORT-8427: Fix
|
2024-09-12 14:44:11 +03:00 |
|
Хакимуллин Артём
|
3539bc504f
|
SUPPORT-8471: little fix
|
2024-09-12 13:50:00 +03:00 |
|
Хакимуллин Артём
|
f51c89f2b0
|
SUPPORT-8471: change config.md
|
2024-09-12 13:39:28 +03:00 |
|
Хакимуллин Артём
|
a4a919678d
|
SUPPORT-8471: change config.md
|
2024-09-12 13:34:22 +03:00 |
|