Commit Graph

32 Commits (a8e1ba6b869c1922c830e3e56c6b48cd2feb3a6e)

Author SHA1 Message Date
Zohaib Iqbal Kambrani a8e1ba6b86 no message 4 years ago
Zohaib Iqbal Kambrani ff508de9f7 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Updates & fixes

# Conflicts: resolved
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
haroon amjad aa36154764 Updates & fixes 4 years ago
Zohaib Iqbal 364ff3344a Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/BookAppointment/QRCode.dart
#   lib/pages/login/register-info.dart
#   lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Zohaib Iqbal Kambrani 940a19d4d7 Merge branch 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into zik_new_design_flutter_v2.5
* 'zik_new_design_flutter_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  ancillary orders update
  Updates & fixes
  fix category issue
  fixes & updates
  lakum fix
  Updates & fixes
  fix translation issue
  Compare duplication fixed
  Updates & fixes
  Updates & fixes
  fix compare issue
  pharmacy fixes
  fix categories & cantact design
  pharmacy fixes
  Updates & fixes
  fix conflict
  Updates & fixes
  Updates & fixes
  Login fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/QRCode.dart
#	lib/pages/BookAppointment/SearchResults.dart
4 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 4 years ago
haroon amjad efced34ffa Updates 4 years ago
haroon amjad 19dadd2b35 Merge branch 'development_v2.5' into haroon_development_2.5 4 years ago
Zohaib Iqbal 259e27d4a7 Merge branch 'development_v2.5' into 'zik_new_design_flutter_v2.5'
# Conflicts:
#   lib/pages/landing/fragments/home_page_fragment2.dart
#   lib/uitl/app_shared_preferences.dart
#   lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 4 years ago
haroon amjad e45c2c5652 covid & pharmacy updates 4 years ago
haroon amjad c175139a29 pharmacy fixes 4 years ago
haroon amjad c2b0326676 Updates & fixes 4 years ago
haroon amjad 502c7fd3de Offers & discounts UI updating 4 years ago
haroon amjad eed4fd2509 Pharmacy prescriptions page design 4 years ago
Zohaib Iqbal Kambrani aad071ac67 Packages and Offers apply token 4 years ago
haroon amjad 58c78656bf Rating dialog updates 4 years ago
Sikander Saleem 74432b6bbb cmc order log ui changes 4 years ago
Mirza.Shafique 5b47aaac6f icon and find us distance 4 years ago
Mirza.Shafique 8a4cf9f23b Line Chart Fix in Vital Signs 4 years ago
Mirza.Shafique ef2bcc1c65 Web RTC Design implementation 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
Mirza.Shafique 831780555c CMC 1.0 4 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 4 years ago
Sikander Saleem c84707ba3f monthly report request & sick leaves ui redesigned. 4 years ago
Mirza.Shafique f577905dcb eye measurment new design 4 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 4 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 4 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 4 years ago
Mirza.Shafique 5f44dece71 Ganaric Font and font implementaion 4 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 4 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 4 years ago