Mohammad Aljammal
|
591d56e624
|
change the info images and change the out patient color
|
5 years ago |
Mohammad Aljammal
|
5c8e43c163
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
5 years ago |
Mohammad Aljammal
|
2553b032dd
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!215
|
5 years ago |
Sultan Khan
|
8becd4f920
|
login issue fixed
|
5 years ago |
Sultan Khan
|
3edae19ad6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
c9538c6a84
|
family files
|
5 years ago |
Mohammad Aljammal
|
33c61afd2a
|
add powered by
|
5 years ago |
Mohammad Aljammal
|
4204abdddc
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
fix issues insurance and medical profile order
See merge request Cloud_Solution/diplomatic-quarter!214
|
5 years ago |
Mohammad Aljammal
|
5e29dff448
|
fix issues insurance and medical profile order
|
5 years ago |
Mohammad Aljammal
|
50b5886b9f
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!213
|
5 years ago |
Sultan Khan
|
355286768a
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
73c8e00852
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
493c62cd99
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
updates & fixes
See merge request Cloud_Solution/diplomatic-quarter!212
|
5 years ago |
Haroon Amjad
|
b0ea1fc262
|
updates & fixes
|
5 years ago |
Mohammad Aljammal
|
b326b0324e
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!211
|
5 years ago |
Sultan Khan
|
18f492e52f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
d53031b0e6
|
blood type update for family files
|
5 years ago |
Mohammad Aljammal
|
bffafa65d1
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!210
|
5 years ago |
Mohammad Aljammal
|
b9958acd53
|
fix issues
|
5 years ago |
Mohammad Aljammal
|
2059b76fc1
|
fix Medical profile
|
5 years ago |
Mohammad Aljammal
|
2d9ade7a5e
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!209
|
5 years ago |
Mohammad Aljammal
|
4d8f42b517
|
fix issues vital sign issue
|
5 years ago |
Mohammad Aljammal
|
4f015a1cda
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
5 years ago |
Mohammad Aljammal
|
f6983c138a
|
fix issues
|
5 years ago |
Mohammad Aljammal
|
f850678fb6
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!208
|
5 years ago |
Sultan Khan
|
37ab778fd0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
b505ed1be7
|
blood type added
|
5 years ago |
Mohammad Aljammal
|
7cd8e1ff40
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!207
|
5 years ago |
Mohammad Aljammal
|
09a85d9127
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
5 years ago |
Mohammad Aljammal
|
adfeabb411
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!205
|
5 years ago |
Mohammad Aljammal
|
9c12e949e8
|
hot fixes
|
5 years ago |
Fatimah Alshammari
|
e5bf7acc52
|
Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
# Conflicts:
# lib/core/viewModels/pharmacyModule/order_model_view_model.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/widgets/pharmacy/product_tile.dart
|
5 years ago |
Fatimah Alshammari
|
fda101840a
|
fixed order isuues
|
5 years ago |
Sultan Khan
|
6b1e7587a8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
a0baaac314
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
aa0d6e206e
|
Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes
See merge request Cloud_Solution/diplomatic-quarter!204
|
5 years ago |
Mohammad Aljammal
|
a8b0af9ee1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes
|
5 years ago |
Mohammad Aljammal
|
d555634e28
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!203
|
5 years ago |
Mohammad Aljammal
|
9c18c69d90
|
hot fixes
|
5 years ago |
haroon amjad
|
53282e3ae6
|
ToDo back issue fixed
|
5 years ago |
haroon amjad
|
ac3bebd59e
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
5 years ago |
haroon amjad
|
8c9762c24f
|
Fixes
|
5 years ago |
Mohammad Aljammal
|
51f7833f50
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!202
|
5 years ago |
Sultan Khan
|
073e79c325
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
040c8f38ab
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
f303235ddd
|
Merge branch 'merge_dq_and_master' into 'master'
Merge dq and master
See merge request Cloud_Solution/diplomatic-quarter!200
|
5 years ago |
Mohammad Aljammal
|
7bc8fdb819
|
fix merge issues
|
5 years ago |
Mohammad Aljammal
|
3c2af11084
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
Conflicts:
lib/pages/landing/landing_page.dart
|
5 years ago |
Mohammad Aljammal
|
f87bcfe064
|
Merge branch 'ZohaibIqbalKambrani' into 'master'
Geofence Android Finished
See merge request Cloud_Solution/diplomatic-quarter!201
|
5 years ago |
Zohaib Kambrani
|
d8996cf879
|
Geofence Android Finished
|
5 years ago |