Amirhossein Mahmoodi
|
11dedbb616
|
Merge branch 'develop' into 'feature/refahi_province_manager'
# Conflicts:
# public/locales/fa/app.json
# src/core/data/apiRoutes.js
|
2023-08-12 16:27:25 +03:30 |
|
AmirHossein Mahmoodi
|
83747201d7
|
Merge branch 'feature/development_assistant' into 'develop'
development assistant init
See merge request witel3/loan-facilities-expert!69
|
2023-08-12 12:47:35 +00:00 |
|
Amirhossein Mahmoodi
|
b7363f2e92
|
Merge branch 'develop' into 'feature/development_assistant'
# Conflicts:
# public/locales/fa/app.json
# src/core/data/apiRoutes.js
# src/core/data/sidebarMenu.jsx
|
2023-08-12 16:16:41 +03:30 |
|
Amirhossein Mahmoodi
|
7af22bab33
|
Merge branch 'develop' into 'feature/development_assistant'
# Conflicts:
# public/locales/fa/app.json
# src/core/data/apiRoutes.js
# src/core/data/sidebarMenu.jsx
|
2023-08-12 16:13:43 +03:30 |
|
AmirHossein Mahmoodi
|
2ef9ae0e30
|
Merge branch 'feature/inspector_expert' into 'develop'
ispector expert init
See merge request witel3/loan-facilities-expert!70
|
2023-08-12 12:22:23 +00:00 |
|
AmirHossein Mahmoodi
|
943a009fc9
|
Merge branch 'develop' into 'feature/inspector_expert'
# Conflicts:
# public/locales/fa/app.json
# src/core/data/apiRoutes.js
# src/core/data/sidebarMenu.jsx
|
2023-08-12 12:22:17 +00:00 |
|
AmirHossein Mahmoodi
|
0e898c9677
|
Merge branch 'feature/commercial_chief' into 'develop'
commercial chief init
See merge request witel3/loan-facilities-expert!71
|
2023-08-12 11:17:11 +00:00 |
|
AmirHossein Mahmoodi
|
53f6285edc
|
Merge branch 'develop' into 'feature/commercial_chief'
# Conflicts:
# src/core/data/apiRoutes.js
|
2023-08-12 11:17:04 +00:00 |
|
AmirHossein Mahmoodi
|
fcfb15daeb
|
Merge branch 'feature/province_head_expert' into 'develop'
province head expert init
See merge request witel3/loan-facilities-expert!72
|
2023-08-12 11:15:47 +00:00 |
|
|
|
5e85ae2119
|
development assistant init
|
2023-08-12 13:37:14 +03:30 |
|
|
|
d9d8695fbf
|
ispector expert init
|
2023-08-12 13:17:39 +03:30 |
|
|
|
31697ec1bd
|
commercial chief init
|
2023-08-12 11:34:38 +03:30 |
|
|
|
df58f782ce
|
province head expert init
|
2023-08-12 10:42:20 +03:30 |
|
AmirHossein Mahmoodi
|
a48c751275
|
Merge branch 'feature/fixedApiAndCommercialCheifPage' into 'develop'
Feature/fixed api and commercial cheif page
See merge request witel3/loan-facilities-expert!67
|
2023-08-12 06:02:02 +00:00 |
|
Amirhossein Mahmoodi
|
3c3d44ce78
|
fixed bug
|
2023-08-09 16:55:40 +03:30 |
|
Amirhossein Mahmoodi
|
fee4fa8261
|
add attachment to confirm and reject forms
|
2023-08-09 15:48:26 +03:30 |
|
Amirhossein Mahmoodi
|
64e717990f
|
used useRequest
|
2023-08-09 15:05:29 +03:30 |
|
Amirhossein Mahmoodi
|
65753c52ca
|
fixed bug auth in useRequest
|
2023-08-09 14:23:00 +03:30 |
|
Amirhossein Mahmoodi
|
c23672c86c
|
add auth to useRequest
|
2023-08-09 14:05:08 +03:30 |
|
Amirhossein Mahmoodi
|
ce3cc53378
|
Rename the files with the appropriate structure
|
2023-08-09 13:53:31 +03:30 |
|
Amirhossein Mahmoodi
|
d33c4b252e
|
Rename the files with the appropriate structure
|
2023-08-09 13:52:57 +03:30 |
|
AmirHossein Mahmoodi
|
2896f7dae5
|
Merge branch 'feature/debug_forms' into 'develop'
Feature/debug forms
See merge request witel3/loan-facilities-expert!66
|
2023-08-09 10:06:03 +00:00 |
|
AmirHossein Mahmoodi
|
400a52dfe1
|
Merge branch 'develop' into 'feature/debug_forms'
# Conflicts:
# src/components/dashboard/machinary-office/TableRowActions.jsx
# src/components/dashboard/passenger-boss/TableRowActions.jsx
# src/components/dashboard/passenger-office/TableRowActions.jsx
# src/components/dashboard/province-manager/TableRowActions.jsx
# src/components/dashboard/transportation-assistance/TableRowActions.jsx
|
2023-08-09 10:05:10 +00:00 |
|
Amirhossein Mahmoodi
|
3726d2ec38
|
implementation errorHandler
|
2023-08-09 12:38:08 +03:30 |
|
|
|
cea6f4c3dc
|
show error in numeric field
|
2023-08-09 11:42:05 +03:30 |
|
|
|
ac33d3f861
|
debug confirm and reject fom
|
2023-08-08 15:21:35 +03:30 |
|
|
|
d7196c7b8d
|
Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_forms
|
2023-08-08 09:43:55 +03:30 |
|
Amirhossein Mahmoodi
|
842f1029c1
|
fixed theme
|
2023-08-07 17:00:23 +03:30 |
|
|
|
9769e28e59
|
Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into develop
|
2023-08-07 16:04:43 +03:30 |
|
Amirhossein Mahmoodi
|
f6904b0334
|
Disable Automatic Revalidations Datatable
|
2023-08-07 14:26:14 +03:30 |
|
|
|
f006058539
|
pulled changes
|
2023-08-07 14:25:05 +03:30 |
|
Amirhossein Mahmoodi
|
f569273970
|
fixed any bugs
|
2023-08-07 14:23:09 +03:30 |
|
Amirhossein Mahmoodi
|
92451c495a
|
fixed any bugs
|
2023-08-07 14:22:49 +03:30 |
|
AmirHossein Mahmoodi
|
68e3f2227b
|
Merge branch 'feature/darkLightTheme' into 'develop'
Feature/dark light theme
See merge request witel3/loan-facilities-expert!65
|
2023-08-07 10:43:47 +00:00 |
|
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 |
|
AmirHossein Mahmoodi
|
aaac273a57
|
Merge branch 'feature/maintainer' into 'develop'
cleaning datatable component and make it more flexible/ debug notification and...
See merge request witel3/loan-facilities-expert!64
|
2023-08-07 10:40:02 +00:00 |
|
|
|
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 |
|
AmirHossein Mahmoodi
|
e14df73dcd
|
Merge branch 'feature/debug_manifest' into 'develop'
Feature/debug manifest
See merge request witel3/loan-facilities-expert!63
|
2023-08-07 06:24:17 +00:00 |
|
|
|
2c3b1e2518
|
example env local
|
2023-08-07 09:49:52 +03:30 |
|
|
|
9e5f5ec7ce
|
add usename and position in sidebar
|
2023-08-06 14:22:58 +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 |
|
AmirHossein Mahmoodi
|
68599e0535
|
Merge branch 'feature/error_pages' into 'develop'
implement error pages
See merge request witel3/loan-facilities-expert!62
|
2023-08-05 11:18:24 +00:00 |
|
|
|
884ad4454c
|
implement error pages
|
2023-08-05 13:44:43 +03:30 |
|
|
|
2211c4803b
|
redesign datatable structure and usage
|
2023-08-05 00:14:13 +03:30 |
|
AmirHossein Mahmoodi
|
b45fd1591c
|
Merge branch 'feature/debug_final_changes' into 'develop'
start a new branch and moved the changes
See merge request witel3/loan-facilities-expert!61
|
2023-08-01 11:37:49 +00:00 |
|
|
|
62db1eedd2
|
start a new branch and moved the changes
|
2023-08-01 15:02:28 +03:30 |
|
