Commit Graph

37 Commits

Author SHA1 Message Date
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
64e717990f used useRequest 2023-08-09 15:05:29 +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
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
de4ab08cd5 transportation assistance implement 2023-07-18 15:15:52 +03:30
Yasiu1376
1139ba0636 debug api routes 2023-07-16 17:04:29 +03:30
0a5bb44770 merge conflict 2023-07-16 16:59:10 +03:30
29d031a83e machinary implement 2023-07-16 15:16:31 +03:30
9caf417101 transportation assistance design 2023-07-16 14:37:24 +03:30
390bd2fd7c machinary office implement 2023-07-16 11:00:57 +03:30
d5de789dd9 passenger office implement 2023-07-15 15:14:16 +03:30
Yasiu1376
22317fe901 user implementt 2023-07-12 11:47:23 +03:30
c43d355565 conflict 2023-07-11 17:29:52 +03:30
c0220a114f interaction with back 2023-07-11 17:17:45 +03:30
Yasiu1376
a3e7bc7237 implement change passwo 2023-07-11 14:58:44 +03:30
Yasiu1376
77c0077638 edit_sidebar 2023-07-11 11:52:12 +03:30
Yasiu1376
985fc83a69 sidebar data 2023-07-10 14:54:50 +03:30
0c7fc9bf8f inject base of project 2023-07-10 12:08:10 +03:30
7ac890e7e7 init project 2023-07-10 11:13:28 +03:30