m.epshtein
|
a297d02967
|
//
(cherry picked from commit b2715649675b8d7543e525a6dd46e98881c0a128)
|
2025-01-24 09:42:43 +03:00 |
|
m.epshtein
|
07b2e306e5
|
//
(cherry picked from commit 71281e499b50fee77b0c1239ee8382647c11ebf8)
|
2025-01-24 09:42:36 +03:00 |
|
m.epshtein
|
13cf5d4e26
|
fonts
(cherry picked from commit 08fa0231e27981127a4d5272d7487beb03320005)
|
2025-01-24 09:42:29 +03:00 |
|
m.epshtein
|
b1b2427344
|
fix
(cherry picked from commit 4343a267233fb647863ddfd631540e67a9b520c6)
|
2025-01-24 09:42:18 +03:00 |
|
m.epshtein
|
e62301d102
|
SUPPORT-8882 1.0
(cherry picked from commit 595d2d5717c32f215ffb5b683f46e915ef1f461d)
|
2025-01-24 09:42:00 +03:00 |
|
Eduard Tihomirov
|
0336c77912
|
SUPPORT-8783: Fix
|
2025-01-24 09:41:15 +03:00 |
|
Eduard Tihomirov
|
7b3f82b7a9
|
SUPPORT-8783: Fix
(cherry picked from commit 8282eb970fe3c91db1a0e3b01fee53eff85cd357)
|
2025-01-24 09:40:09 +03:00 |
|
Eduard Tihomirov
|
bc749d462d
|
SUPPORT-8783: Fix
(cherry picked from commit bbffa1b9043334984f7067f90bbc10c582763b87)
|
2025-01-24 09:39:58 +03:00 |
|
Eduard Tihomirov
|
e9684ab64e
|
SUPPORT-8783: Fix
|
2025-01-23 11:44:40 +03:00 |
|
gulnaz
|
3f04f84c7f
|
Merge branch 'master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ervu/client/okopf/EsnsiOkopfClient.java
# backend/src/main/java/ervu/dao/okopf/OkopfDaoImpl.java
# backend/src/main/java/ervu/service/scheduler/EsnsiOkopfSchedulerServiceImpl.java
# backend/src/main/java/ru/micord/ervu/kafka/controller/ErvuKafkaController.java
# backend/src/main/java/ru/micord/ervu/kafka/model/Data.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/UlDataService.java
# config.md
# config/micord.env
# config/standalone/dev/standalone.xml
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-01-23 11:20:35 +03:00 |
|
Eduard Tihomirov
|
ecec2d595d
|
SUPPORT-8783: add landing
|
2025-01-23 11:19:24 +03:00 |
|
Zaripov Emil
|
6617e42343
|
set version 1.9.8-SNAPSHOT
|
2025-01-23 10:44:05 +03:00 |
|
Zaripov Emil
|
5493593eb9
|
set version 1.9.7
|
2025-01-23 10:41:18 +03:00 |
|
Zaripov Emil
|
118606aeb5
|
Merge remote-tracking branch 'origin/feature/SUPPORT-8868_excerpt_time_zone' into hotfix/1.9.7
|
2025-01-20 10:14:26 +03:00 |
|
Zaripov Emil
|
cb77cb47d1
|
set version 1.9.7-SNAPSHOT
|
2025-01-20 10:05:34 +03:00 |
|
Zaripov Emil
|
6a26bf6fdf
|
set version 1.9.6
|
2025-01-20 10:03:30 +03:00 |
|
gulnaz
|
132daa310f
|
Merge branch 'hotfix/1.9.6' into feature/SUPPORT-8868_excerpt_time_zone
|
2025-01-20 10:02:26 +03:00 |
|
kochetkov
|
01c44dfd07
|
Merge branch 'feature/SUPPORT-8859_fixes' into hotfix/1.9.6
|
2025-01-20 09:58:31 +03:00 |
|
gulnaz
|
ab8b12739a
|
SUPPORT-8868: add time zone to excerpt request
|
2025-01-17 12:12:32 +03:00 |
|
kochetkov
|
a2e1e43e83
|
Merge branch 'hotfix/1.9.6' into develop
# Conflicts:
# backend/pom.xml
# distribution/pom.xml
# frontend/package-lock.json
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-01-16 12:48:58 +03:00 |
|
kochetkov
|
19d999ad07
|
Merge branch 'feature/SUPPORT-8859_fixes' into hotfix/1.9.6
|
2025-01-16 10:42:36 +03:00 |
|
Zaripov Emil
|
7b53c7d6dd
|
set version 1.9.6-SNAPSHOT
|
2025-01-16 10:15:36 +03:00 |
|
Zaripov Emil
|
8f5f109b98
|
set version
|
2025-01-16 10:12:40 +03:00 |
|
Рауф Латыпов
|
d29dde3936
|
SUPPORT-8831: for update after updating platform up to 3.188
|
2025-01-15 17:20:07 +03:00 |
|
Рауф Латыпов
|
0ccdcf2a69
|
Merge branch 'develop' into feature/SUPPORT-8831_button_visibility
# Conflicts:
# frontend/src/ts/ervu/component/grid/InMemoryStaticGrid.ts
|
2025-01-15 17:02:35 +03:00 |
|
kochetkov
|
e382d88c15
|
Merge remote-tracking branch 'origin/hotfix/1.9.5' into develop
# Conflicts:
# config/micord.env
|
2025-01-15 16:36:38 +03:00 |
|
kochetkov
|
9ed34b1c19
|
copy also browser_check.js and fix info.svg error
|
2025-01-15 16:30:43 +03:00 |
|
kochetkov
|
83c4d26c3f
|
update platform to 3.187.2
|
2025-01-15 15:53:45 +03:00 |
|
kochetkov
|
fe42948496
|
Merge branch 'hotfix/1.9.5' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ervu/controller/EmployeeInfoFileUploadController.java
# backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/util/SecurityUtil.java
# config/nginx.conf
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-01-15 13:31:11 +03:00 |
|
kochetkov
|
c17be4426f
|
Merge branch 'feature/SUPPORT-8838_fixes' into hotfix/1.9.5
|
2025-01-15 10:11:55 +03:00 |
|
kochetkov
|
c06b9267ef
|
SUPPORT-8838 fix version
|
2025-01-15 10:11:40 +03:00 |
|
Eduard Tihomirov
|
f44dad90a5
|
Merge branch 'feature/SUPPORT-8845_fix_logout' into hotfix/1.9.5
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/util/SecurityUtil.java
|
2025-01-14 15:57:10 +03:00 |
|
kochetkov
|
992bbee373
|
SUPPORT-8830 fix
|
2025-01-10 16:42:21 +03:00 |
|
Eduard Tihomirov
|
d362df0e0e
|
Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
# backend/pom.xml
# backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java
# backend/src/main/java/ru/micord/ervu/security/esia/config/EsiaConfig.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaTokensStore.java
# backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/filter/JwtAuthenticationFilter.java
# backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
# backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/util/SecurityUtil.java
# config/nginx.conf
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-01-10 13:03:38 +03:00 |
|
Рауф Латыпов
|
dc8ca6edbe
|
SUPPORT-8831: fix for review (1)
|
2025-01-09 18:38:39 +03:00 |
|
Eduard Tihomirov
|
7663a3c685
|
Cherry pick SUPPORT-8682
|
2025-01-09 15:50:29 +03:00 |
|
Zaripov Emil
|
1face050c5
|
set version 1.9.5-SNAPSHOT
|
2025-01-05 17:10:43 +03:00 |
|
Zaripov Emil
|
2be0b5a658
|
Merge branch 'hotfix/1.9.4'
# Conflicts:
# backend/pom.xml
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-01-05 17:08:16 +03:00 |
|
Рауф Латыпов
|
c2ab31331a
|
SUPPORT-8831: fix the method of filter existence (2)
|
2024-12-28 23:31:22 +03:00 |
|
Рауф Латыпов
|
42cfb13670
|
SUPPORT-8831: fix the method of filter existence (2)
|
2024-12-28 23:31:03 +03:00 |
|
Рауф Латыпов
|
31184900bd
|
SUPPORT-8831: fix the method of filter existence
|
2024-12-28 23:11:46 +03:00 |
|
Рауф Латыпов
|
1c357c97dc
|
SUPPORT-8831: fix the method of filter existence
|
2024-12-28 16:05:52 +03:00 |
|
kochetkov
|
d45d25baaf
|
SUPPORT-8830 fixes
|
2024-12-27 19:47:47 +03:00 |
|
Рауф Латыпов
|
dabc1a9ec9
|
SUPPORT-8831: fix for review (1)
|
2024-12-27 12:41:47 +03:00 |
|
Рауф Латыпов
|
549fc90f99
|
SUPPORT-8831: fix for review (1)
|
2024-12-27 12:37:52 +03:00 |
|
Рауф Латыпов
|
b9ca2b5aba
|
SUPPORT-8831: add grid columns filters changed event
+ AC for button visibility
|
2024-12-27 10:59:13 +03:00 |
|
Рауф Латыпов
|
9dcb40a0e0
|
SUPPORT-8831: add grid columns filters changed event
+ AC for button visibility
|
2024-12-27 02:21:26 +03:00 |
|
Zaripov Emil
|
aa945103c2
|
Merge branch 'hotfix/1.9.3'
|
2024-12-26 11:00:56 +03:00 |
|
Zaripov Emil
|
5d78f06673
|
set version 1.9.4-SNAPSHOT
|
2024-12-26 10:56:59 +03:00 |
|
Zaripov Emil
|
60615ff8ea
|
fix
|
2024-12-24 11:26:40 +03:00 |
|