Eduard Tihomirov
|
0c5c15fc51
|
SUPPORT-8427: Fix
|
2024-09-05 14:43:41 +03:00 |
|
Eduard Tihomirov
|
27c316a519
|
SUPPORT-8427: Fix
|
2024-09-05 14:20:46 +03:00 |
|
Eduard Tihomirov
|
704b021816
|
Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu
# Conflicts:
# backend/src/main/java/esia/service/EsiaAuthService.java
|
2024-09-05 14:19:27 +03:00 |
|
Eduard Tihomirov
|
c5d1036769
|
SUPPORT-8427: Fix
|
2024-09-05 13:03:24 +03:00 |
|
Eduard Tihomirov
|
9e990f6e86
|
SUPPORT-8427: Fix
|
2024-09-05 12:58:42 +03:00 |
|
Eduard Tihomirov
|
0d3d2c22b4
|
SUPPORT-8427: Fix
|
2024-09-05 12:08:50 +03:00 |
|
Eduard Tihomirov
|
62d9d449ac
|
SUPPORT-8427: Fix
|
2024-09-05 11:59:52 +03:00 |
|
Eduard Tihomirov
|
b6b2c0ed87
|
SUPPORT-8427: Fix
|
2024-09-05 11:40:29 +03:00 |
|
Eduard Tihomirov
|
a52c30162f
|
SUPPORT-8427: Fix
|
2024-09-05 11:37:43 +03:00 |
|
Eduard Tihomirov
|
cbcddda087
|
SUPPORT-8427: Fix
|
2024-09-05 11:33:07 +03:00 |
|
Eduard Tihomirov
|
7f6b4f1c2d
|
SUPPORT-8427: Fix
|
2024-09-05 10:56:45 +03:00 |
|
Eduard Tihomirov
|
f3a72c4276
|
SUPPORT-8427: Fix
|
2024-09-05 10:52:45 +03:00 |
|
Хакимуллин Артём
|
fb558ad4f9
|
SUPPORT-8471: changes before review
|
2024-09-05 09:58:26 +03:00 |
|
Eduard Tihomirov
|
9cfe9a88fb
|
SUPPORT-8427: Fix
|
2024-09-05 09:05:13 +03:00 |
|
Eduard Tihomirov
|
a5a454474c
|
SUPPORT-8427: Fix
|
2024-09-05 08:51:41 +03:00 |
|
Eduard Tihomirov
|
b21d8d3e1f
|
SUPPORT-8427: Fix
|
2024-09-04 18:48:03 +03:00 |
|
m.epshtein
|
c752c98160
|
fix
|
2024-09-04 18:16:38 +03:00 |
|
m.epshtein
|
492b3e446f
|
Merge branch 'develop' of 10.10.31.70:/ervu-lkrp-ul into develop
|
2024-09-04 18:00:38 +03:00 |
|
m.epshtein
|
cf638af75e
|
new btns
|
2024-09-04 18:00:26 +03:00 |
|
Eduard Tihomirov
|
48c4dee0ee
|
SUPPORT-8427: Fix
|
2024-09-04 17:50:49 +03:00 |
|
Artyom Hackimullin
|
d8370c5bf5
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8471_load_classifier' into feature/SUPPORT-8471_load_classifier
# Conflicts:
# backend/src/main/java/ervu/client/classified/ClassifierOrgClient.java
# backend/src/main/java/ervu/dao/classifier/ClassifierAttributesDaoImpl.java
# backend/src/main/java/ervu/dao/classifier/RecordAttributesDaoImpl.java
# backend/src/main/java/ervu/service/classifier/ClassifierAttributesOrgService.java
# backend/src/main/java/ervu/service/classifier/ClassifierRecordAttributesService.java
# backend/src/main/java/ervu/service/classifier/RecordAttributesServiceImpl.java
|
2024-09-04 17:39:19 +03:00 |
|
Artyom Hackimullin
|
1cd081ccb4
|
SUPPORT-8471: new changes
|
2024-09-04 17:38:21 +03:00 |
|
Eduard Tihomirov
|
dd6f0f618b
|
SUPPORT-8427: Fix
|
2024-09-04 17:36:09 +03:00 |
|
Eduard Tihomirov
|
46647f3e8a
|
SUPPORT-8427: Add security
|
2024-09-04 17:04:39 +03:00 |
|
Makarova Elena
|
ee4d1082ae
|
btn-main на красных кнопках
|
2024-09-04 16:31:58 +03:00 |
|
Eduard Tihomirov
|
b7efe76f22
|
SUPPORT-8427: Fix
|
2024-09-04 15:31:50 +03:00 |
|
Makarova Elena
|
d39b48da66
|
Merge branch 'ERVU-119' into develop
|
2024-09-04 15:18:16 +03:00 |
|
Makarova Elena
|
7afc36b37a
|
Merge remote-tracking branch 'origin/develop' into ERVU-119
|
2024-09-04 14:56:55 +03:00 |
|
kochetkov
|
b28287a930
|
fix
|
2024-09-04 14:54:26 +03:00 |
|
Eduard Tihomirov
|
1dacef1576
|
SUPPORT-8427: Add logout
|
2024-09-04 14:26:29 +03:00 |
|
kochetkov
|
3dfe3d78f8
|
WEBBPMNEXT-9175 migrate to tomcat
|
2024-09-04 13:56:05 +03:00 |
|
Eduard Tihomirov
|
79da353d9d
|
SUPPORT-8474: Fix
|
2024-09-04 13:27:06 +03:00 |
|
Makarova Elena
|
4a75e9153e
|
btn-main
|
2024-09-04 12:31:32 +03:00 |
|
Makarova Elena
|
c7c66ad50f
|
lдобавила класс dropdown-item
|
2024-09-04 12:17:40 +03:00 |
|
Eduard Tihomirov
|
bacf51e1d2
|
Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu
|
2024-09-04 11:45:40 +03:00 |
|
Eduard Tihomirov
|
e98285c3eb
|
SUPPORT-8427: Fix
|
2024-09-04 11:45:19 +03:00 |
|
Makarova Elena
|
7a3d6c8b54
|
Merge remote-tracking branch 'origin/ERVU-119' into ERVU-119
|
2024-09-04 11:44:12 +03:00 |
|
Makarova Elena
|
f774392433
|
добавила класс btn-block на hbox
|
2024-09-04 11:43:56 +03:00 |
|
m.epshtein
|
dfd995e737
|
button.close
|
2024-09-04 11:41:25 +03:00 |
|
m.epshtein
|
6c265865a8
|
button.close
|
2024-09-04 11:40:37 +03:00 |
|
Eduard Tihomirov
|
b27eb092f8
|
Merge branch 'feature/SUPPORT-8427_new' into feature/SUPPORT-8474_id_ervu
# Conflicts:
# Dockerfile
# backend/src/main/java/AppConfig.java
# backend/src/main/java/esia/config/EsiaConfig.java
# backend/src/main/java/esia/controller/EsiaController.java
# backend/src/main/java/esia/model/EmployeeModel.java
# backend/src/main/java/esia/model/PersonModel.java
# backend/src/main/java/esia/service/EsiaAuthService.java
# backend/src/main/java/esia/service/UlDataServiceImpl.java
|
2024-09-04 11:22:30 +03:00 |
|
Makarova Elena
|
d2b5cf6fbb
|
правка наименования файла
|
2024-09-04 11:09:56 +03:00 |
|
Eduard Tihomirov
|
569edb5900
|
SUPPORT-8427: Fix
|
2024-09-04 11:08:30 +03:00 |
|
Eduard Tihomirov
|
b8c38e3a93
|
SUPPORT-8427: Fix
|
2024-09-04 11:01:46 +03:00 |
|
Eduard Tihomirov
|
a2577850aa
|
SUPPORT-8427: Fix
|
2024-09-04 10:33:41 +03:00 |
|
Makarova Elena
|
d065711489
|
Merge remote-tracking branch 'origin/develop' into ERVU-119
|
2024-09-04 10:30:18 +03:00 |
|
Eduard Tihomirov
|
28617f2d94
|
SUPPORT-8427: Fix
|
2024-09-04 10:27:35 +03:00 |
|
Eduard Tihomirov
|
1287558e7d
|
SUPPORT-8427: Fix
|
2024-09-04 10:06:33 +03:00 |
|
Eduard Tihomirov
|
3857a02094
|
Merge branch 'develop' into feature/SUPPORT-8427_new
|
2024-09-03 16:50:24 +03:00 |
|
Eduard Tihomirov
|
c8b8d4790a
|
SUPPORT-8427: Fix
|
2024-09-03 16:38:50 +03:00 |
|