AmirHossein Mahmoodi
|
aafebe8ec8
|
Merge branch 'develop' into 'feature/Amin_sakht_tanafos_period'
# Conflicts:
# src/components/dashboard/loan-history/index.jsx
|
2023-12-25 09:56:58 +00:00 |
|
|
|
65a1ed2716
|
add sakht and tanafos columns in loan history and sync cartables with backend
|
2023-12-25 11:32:07 +03:30 |
|
AmirHossein Mahmoodi
|
f8da988e17
|
Merge tag 'v1.25.6' into develop
v1.25.6
|
2023-12-24 14:35:59 +03:30 |
|
AmirHossein Mahmoodi
|
f379caa3ff
|
Merge branch 'release/v1.25.6'
|
2023-12-24 14:35:44 +03:30 |
|
AmirHossein Mahmoodi
|
0647d02e8f
|
change version
|
2023-12-24 14:35:12 +03:30 |
|
AmirHossein Mahmoodi
|
4a1d7dbf47
|
Merge branch 'feature/Amin_province_loan_history' into 'develop'
add province column and filter
See merge request witel-front-end/loan-facilities/expert!122
|
2023-12-24 11:00:21 +00:00 |
|
|
|
37317469bf
|
delete update row in loan history
|
2023-12-24 14:17:31 +03:30 |
|
|
|
b3f02593f3
|
add province column and filter
|
2023-12-24 13:45:13 +03:30 |
|
|
|
3077ed1d63
|
sync name with back end
|
2023-12-24 11:30:27 +03:30 |
|
|
|
7639898c3a
|
confirm navgan province manager show tanafos and sakht period
|
2023-12-24 10:52:37 +03:30 |
|
|
|
6bfaf6f73b
|
confirm transportation assistance show tanafos and sakht period
|
2023-12-24 10:43:43 +03:30 |
|
|
|
7ca32df7d1
|
confirm passenger boss show tanafos and sakht period
|
2023-12-24 10:30:23 +03:30 |
|
|
|
361127bf0c
|
confirm machinary tanafos and sakht period
|
2023-12-24 10:24:05 +03:30 |
|
AmirHossein Mahmoodi
|
bd319992bb
|
Merge tag '1.25.4' into develop
v1.25.4
|
2023-12-20 15:21:01 +03:30 |
|
AmirHossein Mahmoodi
|
6ca0c22168
|
Merge branch 'release/1.25.4'
|
2023-12-20 15:20:49 +03:30 |
|
AmirHossein Mahmoodi
|
47cbc90d3e
|
change version
|
2023-12-20 15:20:24 +03:30 |
|
AmirHossein Mahmoodi
|
4a99933c42
|
fixed bug
|
2023-12-20 15:18:06 +03:30 |
|
AmirHossein Mahmoodi
|
2d22f12dc4
|
change sidebar
|
2023-12-19 12:07:31 +03:30 |
|
AmirHossein Mahmoodi
|
4cc54bf91d
|
change sidebar
|
2023-12-19 12:04:29 +03:30 |
|
AmirHossein Mahmoodi
|
94b1c734e7
|
change titles
|
2023-12-19 11:18:14 +03:30 |
|
AmirHossein Mahmoodi
|
6ec8202add
|
change titles
|
2023-12-19 11:15:55 +03:30 |
|
AmirHossein Mahmoodi
|
413b434a70
|
Merge branch 'feature/mohammad_add_column' into 'develop'
|
2023-12-10 13:48:18 +00:00 |
|
|
|
55707b4b39
|
update confirm modal of transportation assistant
|
2023-12-10 16:56:59 +03:30 |
|
|
|
dfa26ace1d
|
add approved and proposed column to refer pages and tables and update loan history page texts
|
2023-12-10 16:28:35 +03:30 |
|
AmirHossein Mahmoodi
|
9f42cb52f8
|
Merge tag 'v1.28.3' into develop
v1.28.3
|
2023-12-02 17:18:52 +03:30 |
|
AmirHossein Mahmoodi
|
413c21ae4a
|
Merge branch 'release/v1.28.3'
|
2023-12-02 17:18:34 +03:30 |
|
AmirHossein Mahmoodi
|
d17c647ab9
|
change version to 1.28.3
|
2023-12-02 17:17:50 +03:30 |
|
AmirHossein Mahmoodi
|
29d912e796
|
LFFE-33 Merge branch 'feature/LFFE-33_navgan_province_manager' into 'develop'
|
2023-12-02 13:41:36 +00:00 |
|
Yasiu1376
|
38141795bd
|
LFFE-33 navgan province manager
|
2023-12-02 17:04:09 +03:30 |
|
AmirHossein Mahmoodi
|
cfe65c356b
|
LFFE-32 Merge branch 'feature/LFFE-32_machinary_show_details' into 'develop'
|
2023-12-02 12:13:52 +00:00 |
|
Yasiu1376
|
2cc200eff8
|
LFFE-32 machinary details
|
2023-12-02 15:19:13 +03:30 |
|
AmirHossein Mahmoodi
|
9fd20aadee
|
LFFE-20 Merge branch 'feature/LFFE-20_passenger_boss_show_details' into 'develop'
|
2023-12-02 10:23:51 +00:00 |
|
Yasiu1376
|
b50f0dc11b
|
LFFE-31 passenger boss show details
|
2023-12-02 13:48:18 +03:30 |
|
AmirHossein Mahmoodi
|
89a4a7c657
|
LFFE-31 Merge branch 'feature/LFFE-31_review_clean_code_transportation' into 'develop'
|
2023-12-02 08:02:06 +00:00 |
|
Yasiu1376
|
a0ae62e2cb
|
LFFE-31 review and clean code
|
2023-12-02 11:26:38 +03:30 |
|
AmirHossein Mahmoodi
|
5bde026941
|
Merge tag 'v.1.22.3' into develop
v1.22.3
|
2023-12-02 10:26:54 +03:30 |
|
AmirHossein Mahmoodi
|
e7cd85b182
|
Merge branch 'release/v.1.22.3'
|
2023-12-02 10:26:34 +03:30 |
|
AmirHossein Mahmoodi
|
0d530bac4e
|
change version to 1.22.3
|
2023-12-02 10:25:56 +03:30 |
|
AmirHossein Mahmoodi
|
e1b642e51d
|
LFFE-21 Merge branch 'feature/LFFE-21_transportation_assistance_show_file' into 'develop'
|
2023-12-02 06:32:51 +00:00 |
|
Yasiu1376
|
46c1a2eb2b
|
LFFE-21 transportation assistance
|
2023-11-29 17:00:16 +03:30 |
|
AmirHossein Mahmoodi
|
85d1ee8ca9
|
LFFE-29 Merge branch 'feature/LFFE-29_loan_history' into 'develop'
|
2023-11-29 10:47:39 +00:00 |
|
|
|
a398de7bd3
|
LFFE-29 debug history part and remove useHistory hook
|
2023-11-29 11:45:39 +03:30 |
|
|
|
1b56aff3a6
|
LFFE-29 structured table of data
|
2023-11-28 16:36:58 +03:30 |
|
|
|
a5d8c7bb05
|
LFFE-29 get data from back
|
2023-11-28 16:10:56 +03:30 |
|
|
|
d8eb780a32
|
LFFE-29 table content structured
|
2023-11-21 10:59:51 +03:30 |
|
|
|
b154160a37
|
LFFE-29 first demo of loan history
|
2023-11-20 16:42:38 +03:30 |
|
AmirHossein Mahmoodi
|
dae788377b
|
LFFE-26 Merge branch 'feature/LFFE-26_report_toolbar' into 'develop'
|
2023-11-20 07:47:12 +00:00 |
|
|
|
05009a222a
|
LFFE-26 report toolbar navgan province manager
|
2023-11-20 10:47:39 +03:30 |
|
|
|
22b879c408
|
LFFE-26 report toolbar passenger boss
|
2023-11-20 10:39:07 +03:30 |
|
|
|
f973faffd9
|
LFFE-26 report toolbar machinary office
|
2023-11-20 10:32:00 +03:30 |
|