Commit graph

580 commits

Author SHA1 Message Date
Булат Хайруллин
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
adel.kalimullin
a4864ecad6 SUPPORT-8638:fix from review(3) 2024-11-18 16:04:56 +03:00
kochetkov
7a125a7efd fixes after update merge 2024-11-15 09:53:53 +03:00
kochetkov
08d4aa015b Merge remote-tracking branch 'origin/update/3.185' into develop
# Conflicts:
#	frontend/package.json
2024-11-15 09:45:40 +03:00
adel.kalimullin
1405a33b61 SUPPORT-8638:add new component 2024-11-15 09:41:18 +03:00
kochetkov
fa4c14c448 fix 2024-11-14 09:53:24 +03:00
kochetkov
130a4ddb7f update package-lock 2024-11-14 09:48:40 +03:00
adel.kalimullin
9ec1ccabf9 SUPPORT-8638:fix from review(2) 2024-11-14 08:51:40 +03:00
kochetkov
c4a159b161 Merge branch 'develop' into feature/SUPPORT-8392_add_fork_component
# Conflicts:
#	frontend/src/ts/modules/app/app.module.ts
2024-11-13 16:00:45 +03:00
adel.kalimullin
f43f799591 SUPPORT-8638:fix from review(1) 2024-11-12 16:23:39 +03:00
adel.kalimullin
c0ca6c413e SUPPORT-8638:fix from review 2024-11-12 13:58:50 +03:00
adel.kalimullin
bc62fbd8dd SUPPORT-8638:сlearFilters 2024-11-11 16:50:20 +03:00
adel.kalimullin
17d848d18c SUPPORT-8638:fixes 2024-11-11 15:47:34 +03:00
adel.kalimullin
0aadf64aa0 SUPPORT-8638:add route scripts 2024-11-11 14:08:58 +03:00
ivanov.denis
7ff602baed package.json update 2024-11-07 16:28:38 +03:00
ivanov.denis
5201695472 release 3.185.0 2024-11-07 16:18:13 +03:00
ivanov.denis
b1522ae85c Merge remote-tracking branch 'origin/develop' into update/3.185 2024-11-07 16:17:03 +03:00
y.kuznetsova
0f251248d5 SUPPORT-8392 fix css 2024-10-31 14:52:24 +03:00
y.kuznetsova
feeea9d85e SUPPORT-8392 delete old file and fix version 2024-10-29 17:01:08 +03:00
y.kuznetsova
c68b188c2e SUPPORT-8392 add for component 2024-10-28 14:30:10 +03:00
Artyom Hackimullin
9af75e0779 SUPPORT-8606: fix naming 2024-10-25 11:43:33 +03:00
Artyom Hackimullin
d6455a9943 SUPPORT-8606: commit. Added new condition to see if the bars have data. 2024-10-24 15:17:27 +03:00
Alexandr Shalaginov
0513fa6270 Merge branch 'develop' into feature/SUPPORT-8598_add_last_record_date
# Conflicts:
#	backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/appeals/Keys.java
#	backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/appeals/tables/ReviewRating.java
#	backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/PubRecruitment.java
#	backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java
#	backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java
#	backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/LastRecordingDate.java
#	backend/src/main/java/ru/micord/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/LastRecordingDateRecord.java
#	resources/src/main/resources/business-model/main.page
#	resources/src/main/resources/business-model/milregistration.page
#	resources/src/main/resources/business-model/notregistered.page
#	resources/src/main/resources/business-model/Всего на учете (2й уровень).page
2024-10-23 14:32:40 +03:00
Булат Хайруллин
ae47657ec4 Merge remote-tracking branch 'origin/feature/SUPPORT-8508_add_age_citizen' into develop
# Conflicts:
#	resources/src/main/resources/business-model/citizencard.page
2024-10-22 15:38:14 +03:00
ivanov.denis
73aae1b52a release 3.183.1 2024-10-22 13:01:14 +03:00
Artyom Hackimullin
dffa068a82 SUPPORT-8508: fix 2024-10-22 12:26:30 +03:00
Булат Хайруллин
fff34b407a Merge branch 'develop' into feature/SUPPORT-8500_add_new_formatter 2024-10-22 11:23:12 +03:00
Artyom Hackimullin
ca2bb7da52 Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8508_add_age_citizen 2024-10-22 10:56:30 +03:00
y.kuznetsova
6db6601531 SUPPORT-8565 change component type 2024-10-16 11:17:30 +03:00
root
638b72877e Update for next development version 2024-10-11 14:13:30 +03:00
root
d7675b4872 Update to hotfix version 2024-10-11 14:13:27 +03:00
root
c93ba4208d Update develop version back to pre-merge state 2024-10-11 00:05:32 +03:00
root
1625742c60 Update for next development version 2024-10-11 00:05:26 +03:00
Булат Хайруллин
3d2346bbd4 fix 2024-10-11 00:01:00 +03:00
ivanov.denis
75ecbd1105 release 3.182.0 2024-10-10 13:42:16 +03:00
ivanov.denis
e432a65057 Merge branch 'develop' into update/3.182 2024-10-10 13:27:02 +03:00
Alexandr Shalaginov
e03f01bf1d SUPPORT-8598: refactor 2024-10-09 10:26:34 +03:00
Alexandr Shalaginov
9c5f21d085 SUPPORT-8598: rename component and endpoint 2024-10-09 09:20:33 +03:00
Alexandr Shalaginov
4cd0649dd0 SUPPORT-8598: show update data 2024-10-09 08:35:05 +03:00
Alexandr Shalaginov
4322e25966 SUPPORT-8598: add component 2024-10-08 16:02:59 +03:00
root
9fad75173e Update for next development version 2024-10-07 16:58:35 +03:00