Commit Graph

160 Commits

Author SHA1 Message Date
c91e53bc20 delete commits 2023-08-13 15:41:05 +03:30
2d70f0a088 debug refahi province manager 2023-08-13 15:27:39 +03:30
004feca2aa debug inspector expert and development assistant 2023-08-13 14:58:56 +03:30
e015ac36b6 debug province head expert 2023-08-13 14:16:23 +03:30
Amirhossein Mahmoodi
dbe8ab700c Merge branch 'develop' into 'feature/refahi_province_manager'
# Conflicts:
#   public/locales/fa/app.json
#   src/core/data/apiRoutes.js
2023-08-12 16:40:36 +03:30
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
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
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
53f6285edc Merge branch 'develop' into 'feature/commercial_chief'
# Conflicts:
#   src/core/data/apiRoutes.js
2023-08-12 11:17:04 +00:00
c7270290df refahi province manager init 2023-08-12 14:23:30 +03:30
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
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
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
Amirhossein Mahmoodi
842f1029c1 fixed theme 2023-08-07 17:00:23 +03:30
Amirhossein Mahmoodi
f6904b0334 Disable Automatic Revalidations Datatable 2023-08-07 14:26:14 +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
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
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
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
Amirhossein Mahmoodi
f7a3ec3e2b fixed ToastContainer 2023-08-01 10:10:49 +03:30
Amirhossein Mahmoodi
2d577756d5 fixed _document page 2023-08-01 10:06:42 +03:30
Amirhossein Mahmoodi
fda66b32ea fixed title pages 2023-08-01 10:05:35 +03:30
Amirhossein Mahmoodi
51b21957b9 recode and add editor config file 2023-07-31 09:34:59 +03:30
AmirHossein Mahmoodi
ba91b97e7c Merge branch 'feature/debug_upload_file' into 'develop'
Feature/debug upload file

See merge request witel3/loan-facilities-expert!57
2023-07-30 10:08:46 +00:00
Amirhossein Mahmoodi
298ca1d96f fixed bug 2023-07-24 17:33:35 +03:30
70451c3545 debug 2023-07-24 17:26:04 +03:30
644deb4e48 debug 2023-07-24 17:25:17 +03:30