Amirhossein Mahmoodi
|
3933e2151e
|
fucking commit
|
2025-01-06 13:23:48 +03:30 |
|
Amirhossein Mahmoodi
|
0565a448d6
|
fucking commit
|
2025-01-06 13:21:46 +03:30 |
|
Amirhossein Mahmoodi
|
897a3b3988
|
Merge tag 'v0.13.0' into develop
v0.13.0
|
2025-01-06 13:16:02 +03:30 |
|
Amirhossein Mahmoodi
|
25ab9eb8ae
|
Merge branch 'release/v0.13.0'
|
2025-01-06 13:15:52 +03:30 |
|
Amirhossein Mahmoodi
|
4f6bfc70cb
|
change version
|
2025-01-06 13:15:30 +03:30 |
|
AmirHossein Mahmoodi
|
b6a9315057
|
Merge branch 'feature/gasht_submit' into 'develop'
Feature/gasht submit
See merge request witel-front-end/rms!55
|
2025-01-06 09:42:15 +00:00 |
|
AmirHossein Mahmoodi
|
e7dff8c8a0
|
Merge branch 'develop' into 'feature/gasht_submit'
# Conflicts:
# src/components/dashboard/roadItems/operator/Actions/Create/Forms/GetItemInfo.jsx
|
2025-01-06 09:41:42 +00:00 |
|
|
|
82d8f1c7e9
|
formatting
|
2025-01-06 13:09:46 +03:30 |
|
|
|
6371630380
|
work on patrol form instead sending request
|
2025-01-06 13:08:47 +03:30 |
|
Amirhossein Mahmoodi
|
cedd55e06b
|
Merge branch 'develop' of https://gitlab.com/witel-front-end/rms into develop
|
2025-01-06 12:41:45 +03:30 |
|
Amirhossein Mahmoodi
|
f37e8aea5f
|
add secondary color
|
2025-01-06 12:40:09 +03:30 |
|
AmirHossein Mahmoodi
|
50421b3b3b
|
Merge branch 'feature/observed_gasht_create' into 'develop'
Feature/observed gasht create
See merge request witel-front-end/rms!54
|
2025-01-06 08:53:42 +00:00 |
|
|
|
ae9b4787c5
|
Feature/observed gasht create
|
2025-01-06 08:53:41 +00:00 |
|
Amirhossein Mahmoodi
|
4747802e8a
|
change dedupingInterval to 10s
|
2025-01-06 10:55:51 +03:30 |
|
Amirhossein Mahmoodi
|
3f32a65cdb
|
change icon size
|
2025-01-06 10:52:39 +03:30 |
|
Amirhossein Mahmoodi
|
fa79ee736f
|
change icon size
|
2025-01-06 10:51:57 +03:30 |
|
Amirhossein Mahmoodi
|
58cd380c64
|
better performance
|
2025-01-05 14:22:50 +03:30 |
|
|
|
6a7677ec5c
|
Merge branch 'develop' of https://gitlab.com/witel-front-end/rms into feature/gasht_submit
|
2025-01-05 13:25:25 +03:30 |
|
|
|
cc7daf036a
|
formatting and merge solving conflict
|
2025-01-05 13:25:14 +03:30 |
|
AmirHossein Mahmoodi
|
1559f98a01
|
Merge branch 'bugfix/unit_pass' into 'develop'
Bugfix/unit pass
See merge request witel-front-end/rms!53
|
2025-01-05 09:52:54 +00:00 |
|
|
|
fed5422c59
|
Bugfix/unit pass
|
2025-01-05 09:52:54 +00:00 |
|
|
|
499bc21de9
|
working on actions page
|
2025-01-05 12:51:53 +03:30 |
|
AmirHossein Mahmoodi
|
b612350a04
|
Merge branch 'bugfix/default_values' into 'develop'
Bugfix/default values
See merge request witel-front-end/rms!52
|
2025-01-05 08:21:24 +00:00 |
|
|
|
b3e1eeaad5
|
Bugfix/default values
|
2025-01-05 08:21:24 +00:00 |
|
AmirHossein Mahmoodi
|
52881e8c86
|
Merge branch 'bugfix/default_values' into 'develop'
edit form default values
See merge request witel-front-end/rms!51
|
2025-01-05 08:08:32 +00:00 |
|
|
|
dd4720b636
|
edit form default values
|
2025-01-05 08:08:32 +00:00 |
|
AmirHossein Mahmoodi
|
b08aae0dd3
|
Merge branch 'bugfix/multiple_single_select' into 'develop'
bugfix rahdar code and car code
See merge request witel-front-end/rms!50
|
2025-01-05 07:25:53 +00:00 |
|
|
|
c28824a58e
|
bugfix rahdar code and car code
|
2025-01-05 07:25:53 +00:00 |
|
|
|
bc3db055b1
|
working on supervisor list
|
2025-01-04 18:33:55 +03:30 |
|
|
|
e127e8758e
|
resolve merge conflict and get last changes from develop branch
|
2025-01-04 10:31:39 +03:30 |
|
AmirHossein Mahmoodi
|
fa4c3e1459
|
Merge branch 'feature/user_log_entrance' into 'develop'
Feature/user log entrance
See merge request witel-front-end/rms!49
|
2025-01-01 13:25:58 +00:00 |
|
|
|
7671fddc84
|
Feature/user log entrance
|
2025-01-01 13:25:58 +00:00 |
|
|
|
069895b403
|
working on faaliat information
|
2025-01-01 14:37:11 +03:30 |
|
AmirHossein Mahmoodi
|
90d22be093
|
Merge branch 'feature/gasht_cartables' into 'develop'
Feature/gasht cartables
See merge request witel-front-end/rms!48
|
2024-12-30 10:03:54 +00:00 |
|
|
|
97e6c509f0
|
Feature/gasht cartables
|
2024-12-30 10:03:53 +00:00 |
|
|
|
d68e7d5e59
|
working on partrol form part 4
|
2024-12-30 10:38:53 +03:30 |
|
Amirhossein Mahmoodi
|
d33d069c1e
|
Merge tag 'v0.12.0' into develop
v0.12.0
|
2024-12-29 11:56:10 +03:30 |
|
Amirhossein Mahmoodi
|
3e21a36104
|
Merge branch 'release/v0.12.0'
|
2024-12-29 11:56:00 +03:30 |
|
Amirhossein Mahmoodi
|
eead7e42b4
|
change version to 0.12.0
|
2024-12-29 11:55:42 +03:30 |
|
Amirhossein Mahmoodi
|
3e28bbed92
|
formattting
|
2024-12-29 11:51:29 +03:30 |
|
AmirHossein Mahmoodi
|
ea0f23c873
|
Merge branch 'feature/amiriis_azmayesh' into 'develop'
Feature/amiriis azmayesh
See merge request witel-front-end/rms!47
|
2024-12-29 08:11:22 +00:00 |
|
AmirHossein Mahmoodi
|
d342fa52c2
|
Feature/amiriis azmayesh
|
2024-12-29 08:11:21 +00:00 |
|
AmirHossein Mahmoodi
|
a1d8b43680
|
Merge branch 'feature/gasht_rahdari_cartable' into 'develop'
Feature/gasht rahdari cartable
See merge request witel-front-end/rms!46
|
2024-12-28 13:54:05 +00:00 |
|
|
|
e2d092346e
|
Feature/gasht rahdari cartable
|
2024-12-28 13:54:05 +00:00 |
|
AmirHossein Mahmoodi
|
7b09b61151
|
Merge branch 'feature/filter_relation' into 'develop'
add filter relation
See merge request witel-front-end/rms!45
|
2024-12-28 11:19:45 +00:00 |
|
Amirhossein Mahmoodi
|
57eabf5837
|
add filter relation
|
2024-12-28 14:48:24 +03:30 |
|
AmirHossein Mahmoodi
|
face6dd5f6
|
Merge branch 'feature/amiriis_azmayesh' into 'develop'
Feature/amiriis azmayesh
See merge request witel-front-end/rms!44
|
2024-12-25 11:37:01 +00:00 |
|
AmirHossein Mahmoodi
|
6c5e9506bf
|
Feature/amiriis azmayesh
|
2024-12-25 11:37:01 +00:00 |
|
|
|
753c6e8076
|
working on patrol details and do some update on timeline
|
2024-12-25 15:04:20 +03:30 |
|
|
|
515adb398e
|
resolve conflicts
|
2024-12-23 13:09:03 +03:30 |
|
