Commit Graph

218 Commits

Author SHA1 Message Date
AmirHossein Mahmoodi
d1f031f593 Merge branch 'develop' into 'feature/darkLightTheme'
# Conflicts:
#   src/components/login-expert/index.jsx
#   src/layouts/MuiLayout.jsx
2023-08-07 10:43:41 +00:00
Amirhossein Mahmoodi
ef83aecd5e fixed theme and svgs 2023-08-07 14:11:44 +03:30
e29989ef65 resolve conflict 2023-08-07 14:09:01 +03:30
ac1ad3b8fe cleaning datatable component and make it more flexible/ debug notification and add pending/ add some extra to datatable. 2023-08-07 14:00:04 +03:30
2c3b1e2518 example env local 2023-08-07 09:49:52 +03:30
5e9f977030 Badget icon 2023-08-06 14:01:20 +03:30
1edeac2b44 add env local to theme 2023-08-06 11:23:03 +03:30
21782a4a1a favicon manifest 2023-08-05 16:39:34 +03:30
884ad4454c implement error pages 2023-08-05 13:44:43 +03:30
62db1eedd2 start a new branch and moved the changes 2023-08-01 15:02:28 +03:30
Amirhossein Mahmoodi
51b21957b9 recode and add editor config file 2023-07-31 09:34:59 +03:30
Yasiu1376
87023c0edc role_middleware 2023-07-24 14:37:43 +03:30
1d55033df1 remove conflicts 2023-07-23 16:15:19 +03:30
Yasiu1376
3c3a575ba5 debug_profile 2023-07-23 15:58:28 +03:30
c2019c04b4 debug warning notification 2023-07-23 14:55:48 +03:30
Yasiu1376
f006d7fa2c debug_translate 2023-07-23 14:26:11 +03:30
Yasiu1376
8866cbc52f upload file 2023-07-22 17:26:19 +03:30
Yasiu1376
6ab080c26b Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/upload_file 2023-07-22 15:52:04 +03:30
Yasiu1376
cd51ee14ab upload_file 2023-07-22 15:51:44 +03:30
ac9389274e add minSize tooltip and delete handleClose 2023-07-22 14:44:41 +03:30
520581a8e4 translate datepicker filter status 2023-07-22 14:35:19 +03:30
Yasiu1376
164972475e sidebar_permission 2023-07-19 14:43:30 +03:30
Yasiu1376
8104f94b9e sidebar_permission 2023-07-19 14:39:34 +03:30
a8516b57de province manager 2023-07-19 10:10:23 +03:30
233181165c passenger boss implement 2023-07-18 16:34:32 +03:30
5560dce1dd Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/passenger_boss_design 2023-07-18 15:35:59 +03:30
57910678e4 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_formdata 2023-07-18 15:25:35 +03:30
Yasiu1376
d20a33d3bd debug all datatables 2023-07-18 14:56:32 +03:30
2a87894a14 choose file 2023-07-18 13:26:11 +03:30
db19c29f89 description in cinfirm form 2023-07-18 09:49:09 +03:30
c5b8cd964f debug datatable 2023-07-17 11:59:19 +03:30
0a5bb44770 merge conflict 2023-07-16 16:59:10 +03:30
524d55a084 merge conflict 2023-07-16 16:53:10 +03:30
1ae9532055 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/machinary_office_implement 2023-07-16 16:46:19 +03:30
Yasiu1376
05d436058e datatable_locale 2023-07-16 16:38:26 +03:30
4e9d81ca71 change id to national id 2023-07-16 15:59:31 +03:30
29d031a83e machinary implement 2023-07-16 15:16:31 +03:30
632f009f2c Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/machinary_office_implement 2023-07-16 14:38:45 +03:30
9caf417101 transportation assistance design 2023-07-16 14:37:24 +03:30
Yasiu1376
f7dfd03017 reject_passenger 2023-07-16 14:23:44 +03:30
024da3baf7 machinary implement 2023-07-16 13:39:46 +03:30
d7f3638b67 merg conflict 2023-07-15 16:38:26 +03:30
9150cfdcdc recive new data and remove conflicts 2023-07-15 16:27:57 +03:30
83dad6f040 debug datatable structure 2023-07-15 16:26:35 +03:30
f2568ff74e interaction with back 2023-07-15 16:25:32 +03:30
ff110ad532 Merge branch 'feature/passenger_office_implement' into 'develop'
passenger office implement

See merge request witel3/loan-facilities-expert!25
2023-07-15 11:47:44 +00:00
d5de789dd9 passenger office implement 2023-07-15 15:14:16 +03:30
Yasiu1376
6b4a3e0c9b loading page design 2023-07-15 11:03:02 +03:30
Yasiu1376
76164ed9c4 fix app.json bug 2023-07-13 13:45:41 +03:30
8b8f639a9c Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/passenger_office_design 2023-07-13 11:12:19 +03:30