Commit Graph

401 Commits (7fc47ebf341f6aaa6b8f61ba8c676799e09fa7d6)

Author SHA1 Message Date
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
haroon amjad 4469ae1209 updates & fixes 4 years ago
Mirza.Shafique f577905dcb eye measurment new design 4 years ago
Sikander Saleem 1a0e1f47a6 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 1726f8cc11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan d1fc4751ad BUG FIXES 4 years ago
Sikander Saleem bdb7f29d4c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/login/login.dart
4 years ago
Elham Rababh 2e2f7334d5 fix issues PAP-910,PAP-911 4 years ago
Sikander Saleem ca363adee2 merge & improvements 4 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
4 years ago
Elham Rababh ceeda154d5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Sikander Saleem bb18645d85 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan 9e31a3c560 bug fixes 5 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 5 years ago
haroon amjad 3f29bbd6b3 Updates & fixes 5 years ago
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 11ffed2ae3 bug fixes 5 years ago
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 5 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 5 years ago
Mohammad Aljammal b98a84bcac Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!361
5 years ago
Mohammad Aljammal 41f1704790 Merge branch 'blood_pressure' into 'development'
Blood pressure

See merge request Cloud_Solution/diplomatic-quarter!362
5 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
5 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Elham Rababh d028ce22dc remove unused code 5 years ago
hussam al-habibeh fe83b91602 body fat texfield fix 5 years ago
hussam al-habibeh 864f849425 Baby age in ovulation period 5 years ago
Fatimah Alshammari 787b55a803 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari 34ccb132dc fixed issues 5 years ago
Fatimah Alshammari 74d0826342 fixed issues 5 years ago
Sultan khan 6a0acd8afb Merge branch 'fix-bugs' into 'development'
Fix bugs

See merge request Cloud_Solution/diplomatic-quarter!355
5 years ago
mosazaid 3077624c58 fix bugs 5 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
hussam al-habibeh 4b90f16ab9 baby age in ovulation period 5 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
5 years ago
haroon amjad 90db04cee1 Jira Fixes 5 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh 60aaf2a31a Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
hussam al-habibeh 352fd912de PAP-664 5 years ago
hussam al-habibeh 29249dc9a9 PAP-664 5 years ago
Sikander Saleem f6ae7ed770 merge changes-4 5 years ago
Sikander Saleem 889ae24f07 merge changes-3 5 years ago
Sikander Saleem c07a8f54c7 merge changes-2 5 years ago
Sikander Saleem 14561d0ac6 merge changes-1 5 years ago
Sikander Saleem a5d40f090a improvements-test 5 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 5 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 23ca95b9b6 bug fixes 5 years ago
Mohammad Aljammal 9b3a679948 Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!336
5 years ago
mosazaid e9dbc4be7a fix bugs 5 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
5 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
mosazaid 2e33c2b240 fix bugs 5 years ago
Sultan khan 487d63ec7f Merge branch 'bug_fix_mirza' into 'development'
Check-In NFC

See merge request Cloud_Solution/diplomatic-quarter!326
5 years ago
Sikander Saleem eb9005510d bug fixes and insurance approvals improvements. 5 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 5 years ago
Sultan khan 15f620d720 Merge branch 'Jul_fixes' into 'development'
Jul fixes

See merge request Cloud_Solution/diplomatic-quarter!322
5 years ago
hussam al-habibeh fefde8f575 jira bugs 5 years ago
hussam al-habibeh 446021eb90 adding doctor list to health calculator 5 years ago
hussam al-habibeh 854352d9ce jira bugs 5 years ago
Sikander Saleem d0c8c4f017 Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen. 5 years ago
Elham Rababh dd1dff01d6 PAP-790: fix Alignment of mobile number 5 years ago
Sikander Saleem b7fbee3252 improvements 5 years ago
Sikander Saleem d6566d4abf PAP-678 fixed, month & days in axis are aligned now. 5 years ago
Sikander Saleem 1f01f40ad8 PAP-681 fixed, H2O Unit changing & reflection. 5 years ago
Mohammad Aljammal 234e69c02d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!315
5 years ago
hussam al-habibeh bb6e7e931b pharmacy-bugs 5 years ago
Elham Rababah 2a47564c37 PAP-607: fix issue 5 years ago
hussam al-habibeh 14939d3513 jira bugs (Health Calculator) 5 years ago
Elham Rababah aab33b3e03 PAP-609: fix text align 5 years ago
Mohammad Aljammal e04421079e Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!301
5 years ago
Elham Rababah 6e7f62ca21 PAP-612: show ok and cancel options 5 years ago
Sultan Khan d4c3b03a5f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago