Commit Graph

373 Commits (3896f02d13ec3d4edfa187b9beda7e9fa366ea06)

Author SHA1 Message Date
haroon amjad 3db4094585 Ereferral fixed, HHC moved to new APIs, Notification new design implemented 4 years ago
Mirza.Shafique a766c2522e Child Vaccine 1.0 4 years ago
Mirza.Shafique 41db218e9a oder log merge fix 4 years ago
Mirza.Shafique d3698a0e74 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
4 years ago
Mirza.Shafique 3d480bac5c design fixes 3 4 years ago
haroon amjad 4b0382d7c4 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sikander Saleem 4dca22bec1 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem afad83182d h20 dialog ui changes 4 years ago
haroon amjad a710406317 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_page.dart
#	lib/pages/DrawerPages/family/my-family.dart
4 years ago
haroon amjad 494b1f221d Updates & fixes 4 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 4 years ago
haroon amjad 43a672cc68 Updates & fixes 4 years ago
haroon amjad 5d44fff28d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 4 years ago
Mirza.Shafique ab6f7b8915 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Mirza.Shafique eeaf7d9d2f HMG Services Detail View 4 years ago
Sikander Saleem f13871de9a find us and prescription availability hospital location ui changes, 4 years ago
haroon amjad 03882c166c Translation & UI updates 4 years ago
haroon amjad 90843252c3 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
#	lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 6d3ead24e1 localisation update 4 years ago
Mirza.Shafique 05a6860081 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique e1b79ef5c1 E-Refreal design 4 years ago
Sikander Saleem ecb6315f9c blood pressure, blood sugar, weight, order log & send feedback dialog changes and improvements (cont). 4 years ago
haroon amjad 2db050a228 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad e564cdc7e5 Updates & fixes 4 years ago
Sikander Saleem 0b4305de03 all dialog changes and improvements (cont). 4 years ago
haroon amjad 6511ca8dc7 UI fixes & updates 4 years ago
haroon amjad 07a98d75c6 My tracker fixes 4 years ago
Sikander Saleem 8f371f87d2 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mirza.Shafique dde16a13fe General page in profile 4 years ago
Sikander Saleem 21863cfe06 improvements. 4 years ago
Sikander Saleem ad98dfce67 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
4 years ago
Sikander Saleem 1223ab7a17 h20 week & month graph updated & improvements. 4 years ago
haroon amjad b475adb5c3 Updates & fixes 4 years ago
haroon amjad e62e3dae1b CMC APIs coverting to RC 4 years ago
haroon amjad 0a9d0e5eaa fixes 4 years ago
Sikander Saleem 1346eab593 h2o today page, prescription & schedule appointment improvements. 4 years ago
Sikander Saleem 2aa6ad5d6b h20 today ui (cont.)1 4 years ago
Sikander Saleem 55df00dcd4 h20 today ui (cont.) 4 years ago
Sikander Saleem 763c16ddd0 h2o setting ui redesigned. 4 years ago
Sikander Saleem 8b49eed6ae hospital text replaced with branch 4 years ago
Sikander Saleem b4031e973e chevron icon to arrow forward 4 years ago
Mirza.Shafique 3a40eb92be Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 06c5ee269b Bug Fixes 4 years ago
Sultan Khan 1b387c2dbf changes pushed 4 years ago
Sultan Khan d514f64870 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 76e16594ba FAMILY FILES 4 years ago
haroon amjad 22c6a8ce42 no message 4 years ago
haroon amjad 85d68b0388 ereferral fixes 4 years ago
Sultan Khan fee23de1fd hhc changes 4 years ago
haroon amjad f6d779431a fixes 4 years ago
haroon amjad 8133f8a23a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 46cc73bdd7 CMC changes 4 years ago
Sultan Khan 6159be0f75 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 5fe0214e04 bug fixes 4 years ago
haroon amjad 8cc36ae848 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad dfafb6b664 fixes 4 years ago
Mirza.Shafique 205b4d6b21 Photo view in CMC 4 years ago
Sultan Khan a4ab22a4aa Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 5b988dff4f BUG FIXES 4 years ago
Mirza.Shafique 5e383e57d9 CMC error Fixes 4 years ago
Haroon Amjad 062ca5c11c EReferral fixes 4 years ago
Sikander Saleem f63293ef3e login input rtl 4 years ago
Sikander Saleem 5bdb56df60 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 5fda70decf cmc & hhc order log ui improvements. 4 years ago
Mirza.Shafique f0566fb069 CMC Images 4 years ago
haroon amjad 0955a22616 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sikander Saleem 74432b6bbb cmc order log ui changes 4 years ago
haroon amjad 46d800c0c6 UI updates & fixes 4 years ago
haroon amjad a075d53dd5 UI updates & fixes 4 years ago
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
4 years ago
Sikander Saleem f0bb94c422 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 298a8f4cff Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
#	lib/pages/DrawerPages/family/my-family.dart
4 years ago
Sultan Khan 1d36076320 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan dd58b8637b bug fixs 4 years ago
haroon amjad e8bb4e962c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
4 years ago
Zohaib Iqbal Kambrani 581bbe63bb Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
* 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  Images deleted from assets
  CMC 1.7
  CMC 1.6
  CMC 1.5
4 years ago
Zohaib Iqbal Kambrani 3f178e3e3f Google_Huawei Map -> AppMap 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 4 years ago
Mirza.Shafique f20883184e CMC 1.5 4 years ago
Sultan Khan 32f62fbe56 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan c6fd52aad2 home health care 4 years ago
haroon amjad 948f4fc6b8 CMC Add address fixes 4 years ago
Sultan Khan 4d00664045 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan c6404a2a0b tracker services 4 years ago
haroon amjad 74ca9995c9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
4 years ago
haroon amjad 2d7c7239c5 Health Converters fixes 4 years ago
Mirza.Shafique 2d38e8905b CMC 1.4 4 years ago
haroon amjad 2bba42b574 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad f795ba24c5 updates & fixes 4 years ago
Mirza.Shafique d1bc46f451 CMC Marge 4 years ago
Mirza.Shafique e890c80831 CMC 1.3 4 years ago
Mohammad Aljammal 9fb4e79c34 Merge branch 'sep_fixes' into 'development'
Sep fixes

See merge request Cloud_Solution/diplomatic-quarter!387
4 years ago
Elham Rababh bb372210e0 PAP-938: fix Referral sent 4 years ago
Elham Rababh bff7020b78 PAP-939: fixes 4 years ago
Mirza.Shafique 82a1d410db Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/landing/widgets/logged_slider_view.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 169aafa26b hmc services design fixed 4 years ago
Mirza.Shafique 831780555c CMC 1.0 4 years ago
Sikander Saleem d9c1b8b8ea Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/main.dart
#	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
#	lib/pages/medical/eye/EyeMeasurementsPage.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
4 years ago