8eda45d637
Merge branch 'my_tracker' into 'development'
...
fix bottom nav bar
See merge request Cloud_Solution/diplomatic-quarter!255
4 years ago
3e441c55b2
fix bottom nav bar
4 years ago
76b2342ad8
Merge branch 'my_tracker' into 'development'
...
My tracker
See merge request Cloud_Solution/diplomatic-quarter!254
4 years ago
9d8c1ddf63
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/uitl/translations_delegate_base.dart
4 years ago
484cca086e
fix my my Trackers
4 years ago
f0ee9db952
Merge branch 'Haroon' into 'development'
...
Haroon
See merge request Cloud_Solution/diplomatic-quarter!253
4 years ago
ab158e14e9
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
7c538b350f
LiveCare Scheduling finalized, Appointments in ToDo list categorized
4 years ago
f6fd7587f2
Merge branch 'health-converter' into 'development'
...
health-converter fix
See merge request Cloud_Solution/diplomatic-quarter!252
4 years ago
b767748315
health-converter fix
4 years ago
97919c217f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
4 years ago
1ce0ef7b6c
health-converter fix
4 years ago
dde10cd27b
working in LiveCare Scheduling
4 years ago
db2376f50c
fix blood and weight on my trackers
4 years ago
6945230965
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/pages/landing/home_page.dart
# lib/pages/medical/smart_watch_health_data/health_data_list.dart
# lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
4 years ago
bd5e1ecd50
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!250
4 years ago
38d52b52c8
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
4 years ago
174534d8a5
fix Blood donation functionality and design
4 years ago
405f67be1e
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!249
4 years ago
7a516cae51
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
4 years ago
f06a274ef6
Merge branch 'my_tracker' into 'development'
...
My tracker
See merge request Cloud_Solution/diplomatic-quarter!248
4 years ago
f883e1bd78
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/config/localized_values.dart
4 years ago
0b1014a91c
fix blood sugar service on my tracker
4 years ago
0f22a50a5d
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
4 years ago
535f8876f6
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
HMGInternet & Geofence Merge into Development branch
See merge request Cloud_Solution/diplomatic-quarter!238
4 years ago
9a5daed5c3
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
re-design child vaccine and fix some funcrionalities
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
# Conflicts:
# lib/config/localized_values.dart
4 years ago
b9022be8c1
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!246
4 years ago
bbd953ae43
Order Delivery Driver tracking [inprogress]
4 years ago
3a45239059
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
4 years ago
f5d478fd27
re-design child vaccine and fix some funcrionalities
4 years ago
4457b5f109
add translation to ER service
4 years ago
8d39e8b385
Merge branch 'fix_er' into 'development'
...
Fix ER service
See merge request Cloud_Solution/diplomatic-quarter!244
4 years ago
200334d8f8
Fix ER service
4 years ago
cf59057836
Merge branch 'fix_hhc_cmc' into 'development'
...
Fix hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!243
4 years ago
4ecce79258
first step from fix CMC
4 years ago
c9edb37a3c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
lib/uitl/translations_delegate_base.dart
4 years ago
d7a046f9ca
fix issue on cmc
4 years ago
1cb5e250ed
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!241
4 years ago
80fdebc34d
Merge branch 'design_issues' into 'development'
...
return CMC HHC
See merge request Cloud_Solution/diplomatic-quarter!242
4 years ago
b63025a9b3
return CMC HHC
4 years ago
ff85b2f1b2
Merge branch 'development' into fix_design
4 years ago
5bcc67b77d
Nearest Er fix design
4 years ago
8f499578d5
Merge branch 'fix_design' into 'development'
...
Fix design
See merge request Cloud_Solution/diplomatic-quarter!240
4 years ago
01bfe84644
solving NearestEr design problem
4 years ago
e71a56ed51
Merge branch 'development' into fix_design
4 years ago
d2e1a323ce
simple fix
4 years ago
e2bce87e34
resolve merge conflicts.
4 years ago
013e3b0f1c
Merge branch 'design_issues' into 'development'
...
hot fixing
See merge request Cloud_Solution/diplomatic-quarter!239
4 years ago
30ddea6419
hot fixing
4 years ago
dc83b476d6
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts:
# android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
# ios/Flutter/.last_build_id
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mohammad Aljammal
Mohammad Aljammal
haroon amjad
hussam al-habibeh
mosazaid
Fatimah Alshammari
Zohaib Iqbal Kambrani
Elham Rababah