kochetkov
|
d12fb9937a
|
SUPPORT-8546 small fixes after merge
|
2024-11-02 21:29:00 +03:00 |
|
r.gaztdinov
|
d2257dc6e2
|
links
|
2024-11-02 16:14:40 +03:00 |
|
Zaripov Emil
|
25fb9710b9
|
set version 1.9.1-SNAPSHOT
|
2024-10-31 12:21:19 +03:00 |
|
Zaripov Emil
|
2a1cc194b9
|
set version 1.9.0
|
2024-10-31 12:15:48 +03:00 |
|
Zaripov Emil
|
bc908ee964
|
set version 1.9.0-SNAPSHOT
|
2024-10-25 12:09:15 +03:00 |
|
Zaripov Emil
|
7c7cb3d219
|
Merge branch 'master' into develop
# Conflicts:
# backend/pom.xml
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2024-10-25 12:03:50 +03:00 |
|
Zaripov Emil
|
e257f12201
|
set version 1.8.2
|
2024-10-25 12:02:35 +03:00 |
|
kochetkov
|
8d021cd7a2
|
update versions to snapshot
|
2024-10-23 22:40:32 +03:00 |
|
Халтобин Евгений
|
54366eba21
|
updated version
|
2024-10-23 11:06:03 +03:00 |
|
Eduard Tihomirov
|
8120afbcf4
|
SUPPORT-8601, SUPPORT-8602, SUPPORT-8613, SUPPORT-8599
|
2024-10-18 11:41:42 +03:00 |
|
Zaripov Emil
|
3b8aed2ec4
|
Revert "height=100%"
This reverts commit 9f9d243121.
|
2024-10-17 16:08:53 +03:00 |
|
Zaripov Emil
|
9b178ef558
|
Revert "height=100%"
This reverts commit 9f9d243121.
|
2024-10-17 14:06:07 +03:00 |
|
Eduard Tihomirov
|
7171e5fba1
|
Merge branch 'feature/SUPPORT-8599_file_null' into develop
|
2024-10-16 12:49:43 +03:00 |
|
Eduard Tihomirov
|
b8e0725138
|
set version 1.8.1
|
2024-10-15 14:50:34 +03:00 |
|
Халтобин Евгений
|
59b030e34b
|
Update develop version back to pre-merge state
|
2024-10-11 08:26:32 +03:00 |
|
Халтобин Евгений
|
911fc10c97
|
Update develop to production version to avoid merge conflicts
|
2024-10-11 08:26:25 +03:00 |
|
Халтобин Евгений
|
5ac501ee38
|
Update for next development version
|
2024-10-11 08:26:14 +03:00 |
|
Eduard Tihomirov
|
2ca5c3c0c7
|
SUPPORT-8599: Fix
|
2024-10-11 08:03:19 +03:00 |
|
Халтобин Евгений
|
a93448f461
|
Merge branch 'release/1.8' into feature/SUPPORT-8546_cut_unused
|
2024-10-10 22:29:41 +03:00 |
|
Халтобин Евгений
|
c62bd48dac
|
Merge branch 'develop' into feature/SUPPORT-8546_cut_unused
|
2024-10-10 09:16:19 +03:00 |
|
gulnaz
|
76772df530
|
SUPPORT-8590: parse for client time zone
|
2024-10-07 18:42:45 +03:00 |
|
Халтобин
|
a8b13286b0
|
updated version
|
2024-10-07 09:58:17 +03:00 |
|
Makarova Elena
|
b133940b0d
|
height=100%
|
2024-10-03 12:56:14 +03:00 |
|
Makarova Elena
|
9f9d243121
|
height=100%
|
2024-10-03 12:53:50 +03:00 |
|
kochetkov
|
0939cd0eef
|
fix
|
2024-10-02 10:34:56 +03:00 |
|
Makarova Elena
|
7ff10a29fa
|
floatingFilter = false
|
2024-09-30 15:54:13 +03:00 |
|
Makarova Elena
|
27a9103513
|
фильтр проставила
|
2024-09-30 15:36:48 +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 |
|
Eduard Tihomirov
|
6978ba3011
|
Merge branch 'develop' into feature/SUPPORT-8458_file
# Conflicts:
# backend/src/main/java/ru/micord/ervu/kafka/ReplyingKafkaConfig.java
|
2024-09-24 12:22:44 +03:00 |
|
Eduard Tihomirov
|
61075c6e34
|
SUPPORT-8458: Fix
|
2024-09-24 09:36:18 +03:00 |
|
Eduard Tihomirov
|
fa5cbf9aaa
|
SUPPORT-8458: Fix
|
2024-09-23 10:03:57 +03:00 |
|
Zaripov Emil
|
e8c57afc3f
|
Merge remote-tracking branch 'origin/update_applications' into release/1.0.0
|
2024-09-18 11:48:33 +03:00 |
|
Makarova Elena
|
5b606ae66e
|
замена приложений
|
2024-09-18 10:52:35 +03:00 |
|
Makarova Elena
|
2c0f40ff09
|
fix дата
|
2024-09-17 17:14:43 +03:00 |
|
Makarova Elena
|
4a38e42ada
|
fix дата
|
2024-09-17 15:52:39 +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 |
|
gulnaz
|
7d95b8ccb9
|
Merge branch 'feature/SUPPORT-8411_fixed' into release/1.0.0
|
2024-09-13 17:05:24 +03:00 |
|
Zaripov Emil
|
56117df1e2
|
Merge remote-tracking branch 'origin/develop' into release/1.0.0
|
2024-09-13 14:56:43 +03:00 |
|
Zaripov Emil
|
95d8fa9d13
|
Merge remote-tracking branch 'origin/develop' into release/1.0.0
|
2024-09-13 14:03:52 +03:00 |
|
Makarova Elena
|
ab7aa1fc1e
|
перенос строки в гриде
|
2024-09-13 13:49:29 +03:00 |
|
gulnaz
|
d8d60b5817
|
SUPPORT-8411: change package; fix page and scripts
|
2024-09-13 12:43:17 +03:00 |
|
Makarova Elena
|
6e741860d1
|
убрала класс у красной кнопки
|
2024-09-13 12:37:03 +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 |
|
Makarova Elena
|
e55f55342f
|
ERVU-136
|
2024-09-13 09:28:33 +03:00 |
|
gulnaz
|
37b9ed80b9
|
SUPPORT-8411: fix grid and page
|
2024-09-10 11:38:18 +03:00 |
|
Makarova Elena
|
c760c3606c
|
ERVU-130 добавлен класс pin
|
2024-09-10 10:05:13 +03:00 |
|
SavelevAlex
|
282241217f
|
SUPPORT-8411 : almost done commit
|
2024-09-08 21:14:19 +02:00 |
|
SavelevAlex
|
b7fa56b960
|
SUPPORT-8411 : refactor ervu kafka
|
2024-09-08 10:24:17 +02:00 |
|
Makarova Elena
|
5bd32bf24e
|
инструкция в 2 строки
|
2024-09-06 16:15:34 +03:00 |
|