Commit Graph

202 Commits

Author SHA1 Message Date
AmirHossein Mahmoodi
c025eb26e7 Merge branch 'feature/road_safety_form' into 'develop'
Feature/road safety form

See merge request witel-front-end/rms!26
2024-09-29 07:27:18 +00:00
dceaf5332b Feature/road safety form 2024-09-29 07:27:17 +00:00
AmirHossein Mahmoodi
bfa165408f Merge branch 'feature/design_detail_for_all_cartable' into 'develop'
complete directory structure and adding detail dialog to other pages

See merge request witel-front-end/rms!25
2024-09-24 06:59:02 +00:00
7267e1bc36 complete directory structure and adding detail dialog to other pages 2024-09-24 06:59:02 +00:00
AmirHossein Mahmoodi
805e659103 Merge branch 'feature/inquiry_privacy_tasks_details' into 'develop'
Feature/inquiry privacy tasks details

See merge request witel-front-end/rms!24
2024-09-23 11:08:55 +00:00
95e7ee8ce2 Feature/inquiry privacy tasks details 2024-09-23 11:08:55 +00:00
AmirHossein Mahmoodi
1dfed88410 Merge branch 'feature/mutation_table_row' into 'develop'
add mutate on row actions

See merge request witel-front-end/rms!23
2024-09-22 07:33:19 +00:00
b590095c23 add mutate on row actions 2024-09-22 07:33:19 +00:00
AmirHossein Mahmoodi
f25f6ec962 Merge branch 'feature/refer_form' into 'develop'
refer form admin city/province

See merge request witel-front-end/rms!22
2024-09-18 06:12:50 +00:00
c854cf7b60 refer form admin city/province 2024-09-18 06:12:50 +00:00
AmirHossein Mahmoodi
9e1a5c2289 Merge branch 'feature/city_admin_show_tasks' into 'develop'
complete all 4 pages with their table and make a adapter for datatable

See merge request witel-front-end/rms!21
2024-09-16 13:21:33 +00:00
885c9bdecd complete all 4 pages with their table and make a adapter for datatable 2024-09-16 16:44:59 +03:30
AmirHossein Mahmoodi
20a89754d1 Merge branch 'feature/update_sidebar_for_zamin' into 'develop'
add new pages for panjere vahed to sidebar

See merge request witel-front-end/rms!20
2024-09-16 08:05:35 +00:00
baa0846011 add new pages for panjere vahed to sidebar 2024-09-16 11:32:15 +03:30
AmirHossein Mahmoodi
59b7533739 Merge branch 'feature/update_profile_sidebar' into 'develop'
Feature/update profile sidebar

See merge request witel-front-end/rms!19
2024-09-16 07:59:20 +00:00
AmirHossein Mahmoodi
9387f85cf7 Feature/update profile sidebar 2024-09-16 07:59:19 +00:00
Amirhossein Mahmoodi
3e8abb7580 add pages inquiry privacy 2024-09-16 10:57:31 +03:30
AmirHossein Mahmoodi
8dbcae06b3 Merge branch 'feature/edit_profile' into 'develop'
add mui lab and @resolver/yup for react hook form package and complete change...

See merge request witel-front-end/rms!18
2024-09-16 06:44:03 +00:00
57ae81c791 complete profile update part and password completely 2024-08-27 15:51:05 +03:30
Amirhossein Mahmoodi
cb2248e108 add badge for sidebar 2024-08-27 13:00:17 +03:30
52e7fae709 add mui lab and @resolver/yup for react hook form package and complete change password part with validation and test proccess 2024-08-24 14:39:04 +03:30
c2e0420b79 compelete design of edit profile and change password components 2024-08-21 15:16:40 +03:30
9d9b5838c4 working on uploading image 2024-08-20 16:19:39 +03:30
Amirhossein Mahmoodi
1bd0f7f606 change style 2024-08-19 14:06:38 +03:30
Amirhossein Mahmoodi
7970aecc90 change directory 2024-08-19 13:58:23 +03:30
AmirHossein Mahmoodi
83bfec0d55 Merge branch 'feature/profile_and_icons' into 'develop'
Feature/profile and icons

See merge request witel-front-end/rms!17
2024-08-19 10:15:49 +00:00
AmirHossein Mahmoodi
5186b33a28 Merge branch 'develop' into 'feature/profile_and_icons'
# Conflicts:
#   src/components/layouts/dashboard/headerWithSidebar/index.jsx
#   src/core/components/SidebarMenu.jsx
2024-08-19 10:15:36 +00:00
090e6d0b37 complete profile part and start working on update profile and changing password 2024-08-19 13:40:13 +03:30
Amirhossein Mahmoodi
63d284a64f change style 2024-08-19 13:32:21 +03:30
Amirhossein Mahmoodi
f258dedc78 change style 2024-08-18 15:38:23 +03:30
Amirhossein Mahmoodi
f0c8b9680a fixed bug 2024-08-18 15:25:31 +03:30
Amirhossein Mahmoodi
15bab1a6a4 change style headers 2024-08-18 15:25:20 +03:30
AmirHossein Mahmoodi
65bdcb2cdc Merge branch 'feature/amiriis_header_menu' into 'develop'
add header menu

See merge request witel-front-end/rms!16
2024-08-18 09:51:49 +00:00
Amirhossein Mahmoodi
980a5248f4 add header menu 2024-08-18 13:19:58 +03:30
Amirhossein Mahmoodi
f2e199ee8a formatting 2024-08-18 11:11:58 +03:30
be384141ac start working on profile 2024-08-17 17:33:01 +03:30
aaf885bc4d change icons of page menu 2024-08-17 15:32:22 +03:30
Amirhossein Mahmoodi
f7c93d0404 add version app 2024-08-17 13:42:29 +03:30
Amirhossein Mahmoodi
a467ebe399 fixed bug 2024-08-17 13:16:01 +03:30
Amirhossein Mahmoodi
b602ac5dd2 fixed bug 2024-08-17 13:10:01 +03:30
Amirhossein Mahmoodi
6e4d4b87d3 Merge tag 'v0.6.1' into develop
v0.6.1
2024-08-13 12:09:05 +03:30
Amirhossein Mahmoodi
8cb1adb5a0 Merge branch 'release/v0.6.1' 2024-08-13 12:08:56 +03:30
Amirhossein Mahmoodi
0d5c666c1f change version 2024-08-13 12:08:40 +03:30
Amirhossein Mahmoodi
7be5f0e4bb fixed bug 2024-08-13 12:08:03 +03:30
Amirhossein Mahmoodi
1dd88fabdf fixed bug 2024-08-13 12:01:50 +03:30
Amirhossein Mahmoodi
14eb3fdef2 Merge tag 'v0.6.0' into develop
v0.6.0
2024-08-13 11:34:34 +03:30
Amirhossein Mahmoodi
64f30ad9c7 Merge branch 'release/v0.6.0' 2024-08-13 11:34:26 +03:30
Amirhossein Mahmoodi
64527001fe change version 2024-08-13 11:34:11 +03:30
Amirhossein Mahmoodi
f4ced76432 Merge branch 'develop' of https://gitlab.com/witel-front-end/rms into develop 2024-08-13 11:33:15 +03:30
AmirHossein Mahmoodi
8edf267d93 Merge branch 'feature/localStorage_performance' into 'develop'
Feature/local storage performance

See merge request witel-front-end/rms!15
2024-08-10 12:15:27 +00:00