Eduard Tihomirov
|
1d97152772
|
SUPPORT-9115: Fix
|
2025-04-17 10:15:42 +03:00 |
|
adel.kalimullin
|
a4703b0d4a
|
Merge remote-tracking branch 'origin/release/1.9.11' into develop
# Conflicts:
# backend/src/main/java/ru/micord/ervu/account_applications/EnumColumnFormatter.java
# backend/src/main/java/ru/micord/ervu/account_applications/service/AbstractUserDataService.java
# backend/src/main/java/ru/micord/ervu/account_applications/service/ErvuDirectoriesDaoService.java
# resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на активацию.page
# resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на деактивацию.page
|
2025-04-11 09:19:06 +03:00 |
|
Халтобин Евгений
|
32b31709cf
|
Merge remote-tracking branch 'ervu-frontend/release/ervu/1.9.11' into release/1.9.11
|
2025-04-09 10:45:53 +03:00 |
|
Халтобин Евгений
|
6083a48812
|
Merge branch 'release/1.9.11' into develop
|
2025-04-09 10:08:56 +03:00 |
|
Халтобин Евгений
|
4f6c16b5c7
|
merge ervu-backend/release/ervu/1.9.11
|
2025-04-09 09:40:41 +03:00 |
|
Eduard Tihomirov
|
b201567745
|
Merge branch 'feature/SUPPORT-9035_fix_grids' into feature/SUPPORT-8696_add_kafka
|
2025-04-02 13:26:04 +03:00 |
|
Eduard Tihomirov
|
9a84f2f638
|
SUPPORT-9035: Fix
|
2025-04-02 13:02:44 +03:00 |
|
Eduard Tihomirov
|
be8d088bb9
|
Merge remote-tracking branch 'origin/SUPPORT-8943_seamlessness' into feature/SUPPORT-8696_add_kafka
|
2025-04-01 09:56:50 +03:00 |
|
adel.ka
|
0caca90dda
|
use idm
|
2025-03-31 15:31:21 +03:00 |
|
adel.ka
|
596d0dd8cb
|
use idm
|
2025-03-31 15:27:02 +03:00 |
|
Eduard Tihomirov
|
6639021e39
|
SUPPORT-8696: Fix
|
2025-03-31 14:42:51 +03:00 |
|
Eduard Tihomirov
|
e8cb3205be
|
SUPPORT-8696: Fix
|
2025-03-28 10:18:48 +03:00 |
|
Eduard Tihomirov
|
318152c59b
|
SUPPORT-8696: Fix
|
2025-03-27 15:30:51 +03:00 |
|
adel.ka
|
b32510f0d5
|
edit config
|
2025-03-24 12:44:53 +03:00 |
|
adel.kalimullin
|
339c3dc76d
|
SUPPORT-9002: fixes
|
2025-03-20 16:50:35 +03:00 |
|
adel.kalimullin
|
a5d3f55ff2
|
SUPPORT-9002: fixes
|
2025-03-20 14:03:47 +03:00 |
|
adel.ka
|
74ce742376
|
fixes
|
2025-03-12 14:53:18 +03:00 |
|
pavelzilke@micord.ru
|
95519352f5
|
Update config.yaml
|
2025-03-12 14:08:02 +03:00 |
|
adel.ka
|
e7211b29f7
|
fix
|
2025-03-12 10:14:58 +03:00 |
|
adel.ka
|
2daaceda10
|
fix
|
2025-03-11 19:52:43 +03:00 |
|
adel.ka
|
6371162adf
|
fix
|
2025-03-11 14:52:01 +03:00 |
|
gulnaz
|
f527b92827
|
remove test properties; use token
|
2025-03-10 14:09:47 +03:00 |
|
adel.ka
|
715e60cdc5
|
Merge remote-tracking branch 'origin/SUPPORT-8943_seamlessness' into feature/SUPPORT-8975_load_users
# Conflicts:
# config/micord.env
# resources/src/main/resources/business-model/Список заявок на пользователя/Создать заявку на изменение.page
|
2025-03-10 13:30:01 +03:00 |
|
adel.ka
|
eb4891ab5c
|
SUPPORT-8975: fix from review
|
2025-03-10 13:04:05 +03:00 |
|
adel.ka
|
39ac8f1252
|
SUPPORT-8975: fix from review
|
2025-03-10 13:01:34 +03:00 |
|
gulnaz
|
13eb88fa36
|
fix for test
|
2025-03-07 17:53:15 +03:00 |
|
gulnaz
|
2abae2162f
|
Merge branch 'feature/SUPPORT-8957_manage_users' into SUPPORT-8943_seamlessness
# Conflicts:
# resources/src/main/resources/business-model/Список заявок на пользователя/Обработка заявки на добавление пользователя.page
|
2025-03-07 17:48:50 +03:00 |
|
kochetkov
|
4a851a41ca
|
add debug port
|
2025-03-07 14:11:57 +03:00 |
|
gulnaz
|
8e9ca630a4
|
SUPPORT-8957: add service and controller for user management
|
2025-03-06 18:28:18 +03:00 |
|
adel.kalimullin
|
208a673219
|
SUPPORT-8939 sync
|
2025-02-20 10:58:43 +03:00 |
|
adel.kalimullin
|
91a8fa996a
|
SUPPORT-8939 sync
|
2025-02-19 16:37:47 +03:00 |
|
ivanov.denis
|
31d9c3d704
|
settings.xml
|
2025-02-12 14:36:40 +03:00 |
|
Pavel Zilke
|
b4b652e9b0
|
DEVOPS-1893 fix Dockerfiles
|
2024-12-25 01:12:36 +03:00 |
|
Pavel Zilke
|
115c2a0a78
|
DEVOPS-1893 fix Dockerfile
|
2024-12-25 00:50:39 +03:00 |
|
Pavel Zilke
|
a7b5397ecf
|
DEVOPS-1893 new docker-compose
|
2024-12-25 00:06:37 +03:00 |
|
Pavel Zilke
|
de343de8f5
|
DEVOPS-1893 New Dockerfile
|
2024-12-25 00:05:16 +03:00 |
|
kochetkov
|
f20520cfd0
|
DEVOPS-1893 disable user registration
|
2024-12-24 15:13:36 +03:00 |
|
Pavel Zilke
|
52554d7f29
|
DEVOPS-1893 fix Dockerfile
|
2024-12-24 14:25:25 +03:00 |
|
Pavel Zilke
|
bff5fcd497
|
DEVOPS-1893 tomcat configs
|
2024-12-24 14:12:45 +03:00 |
|
Pavel Zilke
|
137a783700
|
DEVOPS-1893
|
2024-12-24 13:42:06 +03:00 |
|
Павел Цильке
|
90910b954e
|
Update nginx.conf
|
2024-12-24 11:01:12 +03:00 |
|
Павел Цильке
|
17ee170b43
|
Update nginx.conf
|
2024-12-24 10:20:35 +03:00 |
|
Павел Цильке
|
5ea9a6c5f3
|
Update nginx.conf
|
2024-12-22 23:13:54 +03:00 |
|
Павел Цильке
|
95e7642087
|
Update nginx.conf
|
2024-12-21 23:26:42 +03:00 |
|
Павел Цильке
|
fea9dd7aac
|
Update nginx.conf
|
2024-12-21 22:35:47 +03:00 |
|
Павел Цильке
|
29f79258fb
|
update nginx.conf
|
2024-12-20 16:40:34 +03:00 |
|
pavelzilke@micord.ru
|
aa8ea1d062
|
Update config.yaml
|
2024-12-20 14:34:52 +03:00 |
|
pavelzilke@micord.ru
|
7ce59aeb91
|
Update nginx.conf
|
2024-12-20 13:10:54 +03:00 |
|
Халтобин Евгений
|
d028835a55
|
Merge branch 'test' into release/ervu/1.9.1
|
2024-11-30 09:24:42 +03:00 |
|
Булат Хайруллин
|
8c1fd929f3
|
micord.env
|
2024-11-27 14:04:51 +03:00 |
|