Zaripov Emil
|
6f9056392a
|
set version 1.9.2-SNAPSHOT
|
2024-11-05 12:30:30 +03:00 |
|
Zaripov Emil
|
a1ae09b2ea
|
set version 1.9.1
|
2024-11-05 12:27:46 +03:00 |
|
Zaripov Emil
|
441922c1ce
|
Merge branch 'hotfix/1.9.1'
|
2024-11-05 12:26:02 +03:00 |
|
Eduard Tihomirov
|
9949276f0e
|
Merge branch 'feature/SUPPORT-8660_fix_upload_file' into hotfix/1.9.1
|
2024-11-05 10:25:26 +03:00 |
|
Zaripov Emil
|
a519b42a46
|
fix by artyom h
|
2024-11-02 18:16:55 +03:00 |
|
r.gaztdinov
|
d2257dc6e2
|
links
|
2024-11-02 16:14:40 +03:00 |
|
Eduard Tihomirov
|
d73fb2a7f0
|
SUPPORT-8660: Fix
|
2024-11-02 10:48:30 +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
|
549bc93304
|
Merge branch 'release/1.9.0'
|
2024-10-31 12:14:37 +03:00 |
|
Eduard Tihomirov
|
4de1aa69d1
|
SUPPORT-8660: Fix
|
2024-10-31 09:53:26 +03:00 |
|
Zaripov Emil
|
b3ad8e5ca9
|
set version 1.9.0-SNAPSHOT
|
2024-10-25 14:26:15 +03:00 |
|
m.epshtein
|
fb58406cf9
|
//
|
2024-10-25 12:24:57 +03:00 |
|
m.epshtein
|
0e0bc1f674
|
//
|
2024-10-25 12:24:38 +03:00 |
|
m.epshtein
|
bcada18105
|
grid fix
|
2024-10-25 12:24:19 +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 |
|
Zaripov Emil
|
496ea11cef
|
Merge branch 'hotfix/1.8.2'
|
2024-10-25 12:01:49 +03:00 |
|
Zaripov Emil
|
3082614d0a
|
Merge branch 'hotfix/1.8.1'
|
2024-10-25 12:00:14 +03:00 |
|
Eduard Tihomirov
|
541188a28d
|
fix logout
|
2024-10-24 15:18:37 +03:00 |
|
Eduard Tihomirov
|
73a6dad42b
|
fix
|
2024-10-24 12:58:04 +03:00 |
|
Eduard Tihomirov
|
93223065cd
|
fix logout
|
2024-10-24 10:14:50 +03:00 |
|
Халтобин Евгений
|
031617b4c2
|
fix
|
2024-10-24 09:18:15 +03:00 |
|
kochetkov
|
cfa0c269b9
|
Merge branch 'hotfix/1.8.2' into feature/SUPPORT-8609_add_csrf_tokens
|
2024-10-23 22:40:58 +03:00 |
|
kochetkov
|
8d021cd7a2
|
update versions to snapshot
|
2024-10-23 22:40:32 +03:00 |
|
kochetkov
|
93a11898ab
|
Merge remote-tracking branch 'origin/hotfix/1.8.2' into feature/SUPPORT-8609_add_csrf_tokens
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# config/standalone/dev/standalone.xml
# frontend/src/resources/template/app/component/log_out.html
|
2024-10-23 15:05:23 +03:00 |
|
Eduard Tihomirov
|
3059b797df
|
Merge branch 'hotfix/1.8.2' into feature/SUPPORT-8579_access_marker
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# config/standalone/dev/standalone.xml
|
2024-10-23 14:45:41 +03:00 |
|
Eduard Tihomirov
|
86082685bf
|
Merge branch 'hotfix/1.8.1' into hotfix/1.8.2
|
2024-10-23 14:39:52 +03:00 |
|
kochetkov
|
c524fcec3f
|
SUPPORT-8609 small fixes
|
2024-10-23 14:38:22 +03:00 |
|
kochetkov
|
8e74699426
|
SUPPORT-8609 small fix
|
2024-10-23 12:01:08 +03:00 |
|
Eduard Tihomirov
|
ea8c108653
|
sync
|
2024-10-23 11:22:31 +03:00 |
|
Халтобин Евгений
|
54366eba21
|
updated version
|
2024-10-23 11:06:03 +03:00 |
|
Халтобин Евгений
|
b1e8beef4b
|
Merge branch 'hotfix/1.8.1' into develop
|
2024-10-23 11:04:45 +03:00 |
|
Халтобин Евгений
|
311e1583d1
|
removed old props
|
2024-10-23 10:31:51 +03:00 |
|
kochetkov
|
2a0715fc26
|
SUPPORT-8609 dmall fix
|
2024-10-23 10:28:19 +03:00 |
|
kochetkov
|
6536306282
|
SUPPORT-8609 update security config
|
2024-10-23 10:04:11 +03:00 |
|
kochetkov
|
3248a1e444
|
Merge branch 'feature/SUPPORT-8609_add_csrf_tokens' of 10.10.31.70:/ervu-lkrp-ul into feature/SUPPORT-8609_add_csrf_tokens
|
2024-10-22 14:07:22 +03:00 |
|
kochetkov
|
4068277bc3
|
SUPPORT-8609 fixes
|
2024-10-22 14:07:11 +03:00 |
|
gulnaz
|
d46f7ee8c1
|
fix
|
2024-10-22 12:42:20 +03:00 |
|
kochetkov
|
5be19645c0
|
fix after merge
|
2024-10-22 10:19:26 +03:00 |
|
kochetkov
|
a82d48e054
|
Merge remote-tracking branch 'origin/hotfix/1.8.2' into feature/SUPPORT-8609_add_csrf_tokens
# Conflicts:
# backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java
# backend/src/main/java/ru/micord/ervu/security/esia/controller/EsiaController.java
# backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
# config/standalone/dev/standalone.xml
# frontend/src/ts/modules/security/guard/auth.guard.ts
|
2024-10-22 10:15:10 +03:00 |
|
m.epshtein
|
ac7675987f
|
SUPPORT-8636
|
2024-10-21 15:08:25 +03:00 |
|
m.epshtein
|
0e37a0a6e2
|
SUPPORT-8636
|
2024-10-21 14:27:29 +03:00 |
|
Халтобин Евгений
|
474ad39775
|
update env file
|
2024-10-21 08:58:25 +03:00 |
|
Zaripov Emil
|
19fa2c5151
|
ERVU-164 fixed
|
2024-10-19 13:05:23 +03:00 |
|
Халтобин Евгений
|
de4fbf2cb1
|
added access to version
|
2024-10-19 09:02:49 +03:00 |
|
Eduard Tihomirov
|
8120afbcf4
|
SUPPORT-8601, SUPPORT-8602, SUPPORT-8613, SUPPORT-8599
|
2024-10-18 11:41:42 +03:00 |
|
Халтобин Евгений
|
e8c64daa28
|
added fix from Sergei
|
2024-10-18 09:54:53 +03:00 |
|
m.epshtein
|
aafa7ed83e
|
Merge branch 'hotfix/1.8.1' of 10.10.31.70:/ervu-lkrp-ul into hotfix/1.8.1
|
2024-10-17 20:44:03 +03:00 |
|