Commit Graph

2320 Commits (ff72b4b31e64d9d670161172961c75832ddf709c)

Author SHA1 Message Date
haroon amjad ff72b4b31e mobile number updates 3 years ago
haroon amjad 8c96de866b updates 3 years ago
haroon amjad 7d7864a1eb livecare changes 3 years ago
haroon amjad 0ea2550246 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 3 years ago
haroon amjad 32edb2e71e updates 3 years ago
Zohaib Iqbal Kambrani c61de7cfdc no message 3 years ago
Zohaib Iqbal Kambrani 23404b4495 Video call at InAppWebView 3 years ago
Zohaib Iqbal Kambrani 936b7c28f9 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Covid updates & other fixes

# Conflicts: Resolved
#	lib/config/config.dart
#	lib/pages/webRTC/signaling.dart
#	lib/widgets/drawer/app_drawer_widget.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
3 years ago
haroon amjad 927db41068 Covid updates & other fixes 3 years ago
Zohaib Iqbal Kambrani a398220033 no message 3 years ago
Zohaib Iqbal Kambrani a26b17f52d Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5:
  Translation fixes
  OBGyne updates
  updates
  OB Gyne appo updates
  no message
  updates & fixes
  no message
  no message
  Ancillary Orders completed
  updates & fixes

# Conflicts: Resolved
#	lib/pages/BookAppointment/widgets/DentalComplaintCard.dart
#	lib/widgets/drawer/app_drawer_widget.dart
3 years ago
Zohaib Iqbal Kambrani a8e1ba6b86 no message 3 years ago
haroon amjad ac5077e9e7 Translation fixes 3 years ago
haroon amjad f879991b50 OBGyne updates 3 years ago
haroon amjad cbf49e31a1 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_v2.5 3 years ago
haroon amjad 2a343db335 updates 3 years ago
haroon amjad 736edad018 OB Gyne appo updates 3 years ago
haroon amjad 907181a56c Merge branch 'development_v2.5' into haroon_development_2.5
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 4b4ac4819f no message 3 years ago
haroon amjad 3eb7a4325b updates & fixes 3 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
3 years ago
haroon amjad aa36154764 Updates & fixes 3 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
3 years ago
Zohaib Iqbal Kambrani a2efbf6494 no message 3 years ago
Zohaib Iqbal Kambrani 81a3d1ce87 no message 3 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
3 years ago
Zohaib Iqbal Kambrani d974a7430c Google Analytics as per e-Cense document 3 years ago
haroon amjad 4bc67b37e0 no message 3 years ago
Haroon Amjad 1cb7eb2afb CS branch changes 3 years ago
haroon amjad f8b3847d0a Ancillary Orders completed 3 years ago
haroon amjad ea8d700d22 updates & fixes 3 years ago
haroon amjad efced34ffa Updates 3 years ago
haroon amjad 19dadd2b35 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad a6c6651363 Updates & fixes 3 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
3 years ago
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 3 years ago
haroon amjad 7f5f3ababe Registration fix 3 years ago
haroon amjad 0acc134e6e Updates & fixes 3 years ago
haroon amjad e45c2c5652 covid & pharmacy updates 3 years ago
haroon amjad eb6b0aefc0 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!580
3 years ago
haroon amjad 7dbc00a864 ancillary orders update 3 years ago
haroon amjad 693f8cb090 Updates & fixes 3 years ago
Fatimah Alshammari f83adbc6ff Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 3 years ago
Fatimah Alshammari 0b21252ae7 fix category issue 3 years ago
haroon amjad 4acdad0e99 fixes & updates 3 years ago
haroon amjad 8f91d0a0dc lakum fix 3 years ago
haroon amjad 40d649dfa4 Updates & fixes 3 years ago
haroon amjad e53ba65ddd Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
Fatimah Alshammari 0985436a10 fix translation issue 3 years ago
haroon amjad 28107f9a48 Compare duplication fixed 3 years ago