Commit Graph

354 Commits

Author SHA1 Message Date
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
AmirHossein Mahmoodi
a384abf5ac Merge branch 'feature/coreBugs' into 'develop'
Feature/core bugs

See merge request witel3/loan-facilities-expert!60
2023-08-01 06:45:30 +00:00
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
b85a4c03c1 add editor config file 2023-07-31 09:35:34 +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
3a14df43a5 add .idea to .gitignore 2023-07-25 14:39:48 +03:30
Amirhossein Mahmoodi
298ca1d96f fixed bug 2023-07-24 17:33:35 +03:30
61d2088a8e Merge branch 'feature/debug_app_layout' into 'develop'
Feature/debug app layout

See merge request witel3/loan-facilities-expert!59
2023-07-24 13:55:03 +00:00
70451c3545 debug 2023-07-24 17:26:04 +03:30
644deb4e48 debug 2023-07-24 17:25:17 +03:30
c4a268b524 debug 2023-07-24 17:21:52 +03:30
1cd8cc8004 Merge branch 'feature/debug_app_layout' into 'develop'
debug

See merge request witel3/loan-facilities-expert!58
2023-07-24 13:51:29 +00:00
53e03e0e45 change cartables 2023-07-24 16:18:05 +03:30
30395b649f Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_upload_file 2023-07-24 16:06:47 +03:30
f2b3d532ae confirm form handle change 2023-07-24 16:06:23 +03:30
yasaman aliakbari
e605a47737 Merge branch 'feature/role_middleware' into 'develop'
role_middleware

See merge request witel3/loan-facilities-expert!56
2023-07-24 11:09:55 +00:00
Yasiu1376
87023c0edc role_middleware 2023-07-24 14:37:43 +03:30
yasaman aliakbari
c149c697ea Merge branch 'feature/debug_upload_file' into 'develop'
Feature/debug upload file

See merge request witel3/loan-facilities-expert!55
2023-07-24 09:25:05 +00:00
8afbcdf19a publish 3002 2023-07-24 12:52:08 +03:30
cd407e5f17 add delete value in handleDeleteImage 2023-07-24 11:21:40 +03:30
2590c9e4cd Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_upload_file 2023-07-24 10:55:02 +03:30
yasaman aliakbari
4c547b201d Merge branch 'feature/fix_upload' into 'develop'
fix_upload

See merge request witel3/loan-facilities-expert!54
2023-07-24 07:24:18 +00:00
Yasiu1376
4f43d60285 fix_upload 2023-07-24 10:51:58 +03:30
a97cbf1426 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_upload_file 2023-07-24 09:43:43 +03:30
9f4d8697f5 Merge branch 'feature/debug_app_layout' into 'develop'
ampm false

See merge request witel3/loan-facilities-expert!53
2023-07-23 13:23:07 +00:00
459ee099c7 ampm false 2023-07-23 16:53:08 +03:30
85e9d21983 Merge branch 'develop' of https://gitlab.com/witel3/loan-facilities-expert into feature/debug_upload_file 2023-07-23 16:48:05 +03:30
3021bde999 app layout change 2023-07-23 16:47:49 +03:30
24f28f637d Merge branch 'feature/debug_upload_file' into 'develop'
upload system

See merge request witel3/loan-facilities-expert!51
2023-07-23 13:17:19 +00:00