Commit Graph

669 Commits (2690bddcac5f751a4faaac4c6800f1a4ce6c88ea)

Author SHA1 Message Date
haroon amjad 2690bddcac Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 5163c826ad Updates & fixes 3 years ago
Sikander Saleem 6099738a5c improvements 3 years ago
Sikander Saleem df31c82fd5 doctor header review on tap improvement. 3 years ago
Sikander Saleem 5410b826c3 prescriptions new ui updated. 3 years ago
haroon amjad 8cc36ae848 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad dfafb6b664 fixes 3 years ago
Mirza.Shafique 205b4d6b21 Photo view in CMC 3 years ago
haroon amjad 879ce4ee06 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 7675a4496a my vaccine & lab result fix 3 years ago
Mirza.Shafique 5e383e57d9 CMC error Fixes 3 years ago
haroon amjad c91b8ce777 My Vaccines design revamped 3 years ago
haroon amjad dfeb249a54 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad a4a2389a78 updates & fixes 3 years ago
Sikander Saleem f63293ef3e login input rtl 3 years ago
haroon amjad 0955a22616 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 46d800c0c6 UI updates & fixes 3 years ago
Mirza.Shafique ef8006efd8 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
#	lib/pages/Covid-DriveThru/covid-payment-alert.dart
#	lib/pages/Covid-DriveThru/covid-payment-details.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
3 years ago
Mirza.Shafique 5b330b2a25 Covid New Design 3 years ago
Sikander Saleem c96fa62363 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem e36e0ce0b7 h20 bottom nav bar bug fix (happen in release mode) 3 years ago
haroon amjad b0f4cfcff3 Family file fixes 3 years ago
haroon amjad 2fc5425884 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad f55fbd1cc2 UI fixes 3 years ago
haroon amjad a075d53dd5 UI updates & fixes 3 years ago
Sultan Khan a57facb876 family file fix 3 years ago
haroon amjad af7b27258c Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sultan Khan 0e43ca173a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan d535cb421d bug fixes 3 years ago
haroon amjad 4ac0845003 updates & fixes 3 years ago
haroon amjad bbcf22ddfa Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
3 years ago
haroon amjad 92bfe27a6e updates & fixes 3 years ago
Sikander Saleem 8e27d8210a prescription detail ui changes. 3 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
3 years ago
Sikander Saleem 9d67704c67 prescription detail ui changes(cont). 3 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
3 years ago
haroon amjad b3dffc992c App expandable fixes 3 years ago
haroon amjad a2e25f7a7a Merge branch 'development_new_design_2.0' into haroon-new-design 3 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
3 years ago
Mirza.Shafique 999a45c711 App Expendable Design Change 3 years ago
haroon amjad 322a32be21 WebRTC Implementing 3 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
3 years ago
Mirza.Shafique ad3fbdf323 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 717c7b3be4 Lab results designs enhancements 3 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
3 years ago
Zohaib Iqbal Kambrani 3f178e3e3f Google_Huawei Map -> AppMap 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 3 years ago
Mirza.Shafique a67c5afcfb Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique e890c80831 CMC 1.3 3 years ago