Artyom Hackimullin
|
7408c27cee
|
SUPPORT-8606: fix
|
2025-01-10 13:38:47 +03:00 |
|
Artyom Hackimullin
|
64c2516210
|
Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8606_show_result_null
# Conflicts:
# frontend/src/ts/ervu-dashboard/component/chart/ChartUtils.ts
# resources/src/main/resources/business-model/main.page
# resources/src/main/resources/business-model/notregistered.page
# resources/src/main/resources/business-model/Всего на учете (2й уровень).page
|
2025-01-10 13:36:09 +03:00 |
|
adel.ka
|
a6acaeec57
|
SUPPORT-8638:add new condition
|
2025-01-10 12:15:58 +03:00 |
|
adel.ka
|
082c512d53
|
Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8638
# Conflicts:
# frontend/src/ts/modules/app/app.module.ts
|
2025-01-10 11:53:39 +03:00 |
|
Рауф Латыпов
|
6da476d993
|
SUPPORT-8717: sync with erve-business-metrics
|
2025-01-09 18:15:29 +03:00 |
|
adel.ka
|
5fb3124f8b
|
Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8772_fileupload
# Conflicts:
# config/micord.env
|
2025-01-09 14:15:58 +03:00 |
|
m.epshtein
|
7585dfc28e
|
nav-filled
|
2024-12-27 17:00:54 +03:00 |
|
m.epshtein
|
7bb183ca39
|
selectize-dropdown: set fit-content for scroll
|
2024-12-27 15:53:31 +03:00 |
|
m.epshtein
|
e8e8511854
|
SUPPORT-8837
|
2024-12-27 15:03:10 +03:00 |
|
m.epshtein
|
60d2e08c87
|
//
|
2024-12-27 13:47:37 +03:00 |
|
m.epshtein
|
adf87f63e6
|
date-time-picker
|
2024-12-27 13:01:19 +03:00 |
|
m.epshtein
|
ed2e9f91f9
|
SUPPORT-8833
|
2024-12-26 20:23:54 +03:00 |
|
m.epshtein
|
2c14514808
|
//
|
2024-12-26 19:20:04 +03:00 |
|
m.epshtein
|
f9d8cc27b3
|
search-block
|
2024-12-26 16:58:46 +03:00 |
|
m.epshtein
|
6e4f039209
|
//
|
2024-12-26 16:09:16 +03:00 |
|
m.epshtein
|
9e9acc498c
|
//
|
2024-12-26 13:49:49 +03:00 |
|
m.epshtein
|
77aa984f50
|
citizen
|
2024-12-26 13:22:54 +03:00 |
|
m.epshtein
|
b85fae3926
|
loader fix
|
2024-12-26 09:49:53 +03:00 |
|
m.epshtein
|
9fb2e18dd1
|
//
|
2024-12-26 09:36:12 +03:00 |
|
m.epshtein
|
5d301cccc1
|
SUPPORT-8826
|
2024-12-25 17:37:27 +03:00 |
|
m.epshtein
|
08c4292737
|
radio-horizontal
|
2024-12-25 12:20:14 +03:00 |
|
m.epshtein
|
027501d827
|
tab-subtitle
|
2024-12-24 15:04:04 +03:00 |
|
adel.ka
|
49225ec606
|
SUPPORT-8772:fix by review
|
2024-12-19 15:29:56 +03:00 |
|
adel.ka
|
193f3f2d96
|
SUPPORT-8772:fix by review
|
2024-12-19 13:11:09 +03:00 |
|
adel.ka
|
4075af393e
|
SUPPORT-8772:fix by review
|
2024-12-19 10:20:26 +03:00 |
|
adel.ka
|
60b3f79752
|
SUPPORT-8772:fix
|
2024-12-19 09:19:35 +03:00 |
|
adel.ka
|
0c1c5bbdcf
|
SUPPORT-8772:add new fileUpload
|
2024-12-18 16:21:23 +03:00 |
|
m.epshtein
|
0108ec7863
|
text-fixed-percent-medium
|
2024-12-16 17:25:54 +03:00 |
|
m.epshtein
|
713313c4eb
|
text-fixed-percent
|
2024-12-16 11:26:00 +03:00 |
|
Булат Хайруллин
|
9e5bc7f49f
|
fix
|
2024-12-16 01:10:32 +03:00 |
|
Булат Хайруллин
|
6cc08e7765
|
Merge branch 'version1.9.1_for_AC' into develop+AC
|
2024-12-16 00:05:47 +03:00 |
|
m.epshtein
|
da5aa5d6e8
|
//
|
2024-12-15 23:29:42 +03:00 |
|
m.epshtein
|
ef183298c1
|
//
|
2024-12-15 23:26:10 +03:00 |
|
m.epshtein
|
115fe4c326
|
mini -> xmini
|
2024-12-15 23:23:15 +03:00 |
|
m.epshtein
|
8f4718467f
|
//
|
2024-12-15 22:47:00 +03:00 |
|
m.epshtein
|
a5aef832c3
|
//
|
2024-12-15 21:46:44 +03:00 |
|
m.epshtein
|
9351ac5cde
|
//
|
2024-12-15 21:19:54 +03:00 |
|
Булат Хайруллин
|
beb04850e6
|
fix
|
2024-12-15 20:03:17 +03:00 |
|
kochetkov
|
fac9b77463
|
update ngx-treeview
|
2024-12-13 15:54:27 +03:00 |
|
Булат Хайруллин
|
324311bf0e
|
app-config.json
|
2024-12-11 11:13:43 +03:00 |
|
Булат Хайруллин
|
f14344869d
|
fileupload.page
|
2024-12-04 16:42:02 +03:00 |
|
root
|
e7c8867948
|
Update for next development version
|
2024-11-20 16:57:48 +03:00 |
|
root
|
5d4ad8078f
|
Update to hotfix version
|
2024-11-20 16:57:45 +03:00 |
|
root
|
570e7e99af
|
Update for next development version
|
2024-11-20 16:57:43 +03:00 |
|
root
|
31c8805913
|
Update versions for hotfix
|
2024-11-20 16:54:30 +03:00 |
|
root
|
1124882f4c
|
Update develop version back to pre-merge state
|
2024-11-20 16:41:01 +03:00 |
|
root
|
f1749032b2
|
Update develop to production version to avoid merge conflicts
|
2024-11-20 16:40:58 +03:00 |
|
root
|
eb703b6664
|
Update for next development version
|
2024-11-20 16:40:55 +03:00 |
|
root
|
225d732bc3
|
Update for next development version
|
2024-11-20 16:02:48 +03:00 |
|
kochetkov
|
367cc17235
|
sync poms and delete test module
|
2024-11-20 14:21:16 +03:00 |
|