Commit Graph

2741 Commits (ab8b62bc3a6d395171c979487364757dcc8cb280)
 

Author SHA1 Message Date
Zohaib Iqbal Kambrani ab8b62bc3a Packages and offers fixes, HMG Internet work in progress, 4 years ago
haroon amjad 0ae4a13c02 Merge branch 'zik_new_design_flutter_v2.5' into 'development_v2.5'
Zik new design flutter v2.5

See merge request Cloud_Solution/diplomatic-quarter!570
4 years ago
Zohaib Iqbal Kambrani 1a6a26be75 Merge branch 'development_v2.5' into zik_new_design_flutter_v2.5
* development_v2.5: (36 commits)
  merge improvements
  Health plugin updated
  fix search issue
  JIRA bug fixes
  updates & fixes
  Fixes & updates
  six issues
  nfc plugin improvement.
  disable lakum on check out page
  fix issue
  fix lakum issues
  Smartwatch fixes
  screen plugin improvement.
  Updates & fixes
  video call camera view issue fix, barcode plugin change, smart watches improvements.
  add quantity filed fixed
  pharmacy uo fix
  Fixes
  fix issue
  Speech to text fix in iOS
  ...

# Conflicts: Resolved
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
#	android/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/pages/conference/web_rtc/widgets/cam_view_widget.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/livecare/incoming_call.dart
4 years ago
Sikander Saleem c8b5602d8e flutter 2.8 improvements. 4 years ago
Sikander Saleem 3ad90f1a01 Merge branch 'development_new_design_2.0' into development_v2.5 4 years ago
haroon amjad 35d1d0998a Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!568
4 years ago
haroon amjad 7733c74f00 Updates & fixes 4 years ago
Zohaib Iqbal Kambrani 63ffabcc86 no message 4 years ago
Sikander Saleem 684add0090 merge improvements 4 years ago
Sikander Saleem 9ba7b3b44b Merge branch 'development_new_design_2.0' into development_v2.5
# Conflicts:
#	lib/pages/BookAppointment/BookConfirm.dart
#	lib/pages/medical/smart_watch_health_data/syncHealthData.dart
#	lib/pages/vaccine/my_vaccines_screen.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	pubspec.yaml
4 years ago
haroon amjad c379c6a37b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 4a0997cf49 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!567
4 years ago
haroon amjad e5703586ec Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!566
4 years ago
haroon amjad 4c2410cfd5 Health plugin updated 4 years ago
Fatimah Alshammari 216cc4a7e3 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 4 years ago
Fatimah Alshammari d767febcd0 fix search issue 4 years ago
haroon amjad 7bc8f69dfb JIRA bug fixes 4 years ago
haroon amjad f2001e9877 Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!565
4 years ago
haroon amjad 2670d0be57 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 0fb6e9897a Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!564
4 years ago
haroon amjad 9c0337aa01 updates & fixes 4 years ago
haroon amjad 330f2d6c86 Fixes & updates 4 years ago
Fatimah Alshammari b09b1e4732 six issues 4 years ago
Sikander Saleem 2a92478d01 nfc plugin improvement. 4 years ago
Fatimah Alshammari f9d1bbe2ee disable lakum on check out page 4 years ago
Fatimah Alshammari cf7dd13a83 fix issue 4 years ago
Fatimah Alshammari ff7146e259 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart
#	lib/pages/pharmacy/pharmacyContacts.dart
4 years ago
Fatimah Alshammari de86cffb8c fix lakum issues 4 years ago
haroon amjad d5b58c07ca Smartwatch fixes 4 years ago
Sikander Saleem 2fd0fd3f85 screen plugin improvement. 4 years ago
haroon amjad b76183040c Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!563
4 years ago
haroon amjad a60e878fef Updates & fixes 4 years ago
Sikander Saleem 628439ddf8 video call camera view issue fix, barcode plugin change, smart watches improvements. 4 years ago
haroon amjad 0b4e674097 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 03e554b1af Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!562
4 years ago
hussam al-habibeh cf556c66b0 add quantity filed fixed 4 years ago
haroon amjad bb9aaf9945 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/availability_info.dart
4 years ago
haroon amjad a7c052cda8 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!561
4 years ago
hussam al-habibeh 516fddf962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hussam_pharmacy_fix 4 years ago
hussam al-habibeh e291d46af7 pharmacy uo fix 4 years ago
haroon amjad 207525e31a Fixes 4 years ago
Fatimah Alshammari 10b96979a3 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 749b89b67d fix issue 4 years ago
haroon amjad 94aab4a737 Speech to text fix in iOS 4 years ago
haroon amjad 8e00c59746 Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!560
4 years ago
Fatimah Alshammari a1b4e1c8a3 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 7ffb431454 added map luncher 4 years ago
haroon amjad 323f32267b Merge branch 'haroon-new-design' into 'development_new_design_2.0'
Haroon new design

See merge request Cloud_Solution/diplomatic-quarter!559
4 years ago
haroon amjad 3b9c1eb9ed Appointment booking fix 4 years ago
Sikander Saleem caec2c4ca4 video call improvements. 4 years ago