adel.ka
|
9a7f1e1168
|
Merge branch 'master' into develop
# Conflicts:
# backend/pom.xml
# config-data-executor/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-11-21 18:29:10 +03:00 |
|
adel.ka
|
84b08ce448
|
Merge branch 'hotfix/1.1.5'
|
2025-11-21 18:18:04 +03:00 |
|
adel.ka
|
6302e630ab
|
Update for next development version
|
2025-11-21 18:15:39 +03:00 |
|
adel.ka
|
682d3b1bcc
|
DocumentBuilderFactory DTD fix
|
2025-11-21 18:14:04 +03:00 |
|
adel.ka
|
986018890c
|
Update versions for hotfix
|
2025-11-21 18:10:43 +03:00 |
|
Eduard Tihomiorv
|
ffcd582f46
|
Update for next development version
|
2025-11-21 14:37:35 +03:00 |
|
Eduard Tihomiorv
|
297ab97d09
|
Merge branch 'master' into develop
|
2025-11-21 14:36:54 +03:00 |
|
Eduard Tihomiorv
|
e9b0980e5b
|
Merge branch 'hotfix/1.1.4'
|
2025-11-21 14:36:10 +03:00 |
|
Eduard Tihomiorv
|
833b307afb
|
Update for next development version
|
2025-11-21 14:35:29 +03:00 |
|
Eduard Tihomiorv
|
33b7856adb
|
Merge branch 'develop' into hotfix/1.1.4
|
2025-11-21 14:34:12 +03:00 |
|
Eduard Tihomiorv
|
9db6c95ab0
|
Update versions for hotfix
|
2025-11-21 14:33:35 +03:00 |
|
Eduard Tihomiorv
|
e3d9a7098a
|
Update for next development version
|
2025-11-21 14:31:16 +03:00 |
|
Eduard Tihomiorv
|
42e46f4496
|
Merge branch 'master' into develop
|
2025-11-21 14:30:05 +03:00 |
|
Eduard Tihomiorv
|
c5885923ef
|
Update for next development version
|
2025-11-21 14:22:37 +03:00 |
|
Eduard Tihomiorv
|
c15d639c5a
|
Merge branch 'develop' into hotfix/1.1.3
|
2025-11-21 14:19:23 +03:00 |
|
Pavel Zilke
|
3282b7bb8b
|
Update Dockerfile for RT-SK
|
2025-11-21 14:18:19 +03:00 |
|
Eduard Tihomiorv
|
80318469c5
|
Update versions for hotfix
|
2025-11-21 14:17:01 +03:00 |
|
kochetkov
|
4a85a48c6a
|
fix
|
2025-11-21 13:46:14 +03:00 |
|
kochetkov
|
f8a8291395
|
update dep versions
|
2025-11-21 13:32:52 +03:00 |
|
kochetkov
|
acf5cc7759
|
Update for next development version
|
2025-11-21 12:27:01 +03:00 |
|
kochetkov
|
0cb7ca2599
|
Merge tag '1.1.2' into develop
Tag hotfix
|
2025-11-21 12:26:59 +03:00 |
|
kochetkov
|
4e304804ed
|
Update to hotfix version
|
2025-11-21 12:26:59 +03:00 |
|
kochetkov
|
bc3f9d661b
|
Merge branch 'hotfix/1.1.2'
|
2025-11-21 12:26:56 +03:00 |
|
kochetkov
|
58346dbcf3
|
Update for next development version
|
2025-11-21 12:26:55 +03:00 |
|
kochetkov
|
a54196d787
|
fix
|
2025-11-21 10:46:05 +03:00 |
|
kochetkov
|
a10e2d7608
|
Merge branch 'develop' into hotfix/1.1.2
# Conflicts:
# config-data-executor/pom.xml
|
2025-11-21 10:23:53 +03:00 |
|
kochetkov
|
fe21fb83f2
|
Update versions for hotfix
|
2025-11-21 10:20:42 +03:00 |
|
kochetkov
|
b1853084a9
|
fix
|
2025-11-21 09:24:11 +03:00 |
|
kochetkov
|
b3818ad99c
|
fix
|
2025-11-20 18:51:01 +03:00 |
|
kochetkov
|
9f51bffe0a
|
fix
|
2025-11-20 16:35:42 +03:00 |
|
kochetkov
|
5e22adc842
|
fix
|
2025-11-20 09:56:15 +03:00 |
|
kochetkov
|
14e99fd2f3
|
fix
|
2025-11-20 09:51:20 +03:00 |
|
kochetkov
|
45b3d05ad0
|
update platform to 6
|
2025-11-20 09:42:30 +03:00 |
|
Eduard Tihomiorv
|
8382f451b4
|
Set version to 1.1.1
|
2025-11-13 17:58:10 +03:00 |
|
Eduard Tihomiorv
|
149cf54016
|
fix
|
2025-11-13 16:39:54 +03:00 |
|
Eduard Tihomiorv
|
f677f7c68e
|
Merge branch 'develop' of 10.10.31.70:/ervu-eks into develop
|
2025-11-13 16:32:20 +03:00 |
|
Eduard Tihomiorv
|
cbab80fac3
|
fix limit
|
2025-11-13 16:31:57 +03:00 |
|
kochetkov
|
8769a41826
|
Update develop version back to pre-merge state
|
2025-11-13 16:26:07 +03:00 |
|
kochetkov
|
a8e90d1819
|
Merge tag '1.1.1' into develop
Tag release
|
2025-11-13 16:26:04 +03:00 |
|
kochetkov
|
5869d0001a
|
Update develop to production version to avoid merge conflicts
|
2025-11-13 16:26:04 +03:00 |
|
kochetkov
|
a929b1a5fc
|
Merge branch 'release/1.1.1'
# Conflicts:
# frontend/src/resources/css/style.css
|
2025-11-13 16:25:49 +03:00 |
|
kochetkov
|
503a3c556b
|
Update for next development version
|
2025-11-13 15:45:04 +03:00 |
|
kochetkov
|
1c9e6de9c3
|
Merge branch 'release/1.1.0' into release/1.1.1
# Conflicts:
# backend/pom.xml
# config-data-executor/pom.xml
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-11-13 15:36:54 +03:00 |
|
kochetkov
|
a504cd251c
|
Merge branch 'release/1.1.0' into develop
# Conflicts:
# backend/pom.xml
# config-data-executor/pom.xml
# distribution/pom.xml
# frontend/pom.xml
# pom.xml
# resources/pom.xml
|
2025-11-13 15:35:34 +03:00 |
|
kochetkov
|
37e5bdd4dc
|
Update for next development version
|
2025-11-13 13:06:10 +03:00 |
|
kochetkov
|
6af37c84b3
|
Update versions for release
|
2025-11-13 13:06:07 +03:00 |
|
kochetkov
|
bf7e8a3d75
|
Merge remote-tracking branch 'origin/update/5.0' into develop
|
2025-11-13 13:01:27 +03:00 |
|
Eduard Tihomiorv
|
38a6d24a89
|
fix encode file name
|
2025-11-12 17:28:43 +03:00 |
|
Pavel Zilke
|
d4accb81eb
|
fix docker-compose.tc
|
2025-10-23 14:31:17 +03:00 |
|
Pavel Zilke
|
7f45414077
|
fix ocker-compose.tc
|
2025-10-23 14:04:58 +03:00 |
|