Commit Graph

2772 Commits (e53ba65dddfd332ea0a57e4748ec3cfcd010a9f1)
 

Author SHA1 Message Date
haroon amjad e53ba65ddd Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad cd797123a3 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!578
3 years ago
Fatimah Alshammari 55cc5dae4f Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 3 years ago
Fatimah Alshammari 0985436a10 fix translation issue 3 years ago
haroon amjad 28107f9a48 Compare duplication fixed 3 years ago
haroon amjad 8c3b443f79 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad 4e3d99b007 Updates & fixes 3 years ago
haroon amjad bac6774534 Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!576
3 years ago
Fatimah Alshammari e5f0f5777b Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
#	lib/services/pharmacy_services/product_detail_service.dart
3 years ago
haroon amjad 1fc45e3f7c Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!577
3 years ago
haroon amjad 6d88607631 Updates & fixes 3 years ago
Fatimah Alshammari 9740f88e6b Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 3 years ago
Fatimah Alshammari 57d10d9e1f fix compare issue 3 years ago
haroon amjad 1f19af01c4 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad c175139a29 pharmacy fixes 3 years ago
haroon amjad 0ac937aa7d Merge branch 'fatima_v2' into 'development_v2.5'
Fatima v2

See merge request Cloud_Solution/diplomatic-quarter!575
3 years ago
Fatimah Alshammari 71a28e2ed6 Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2 3 years ago
Fatimah Alshammari cc783045bb fix categories & cantact design 3 years ago
haroon amjad 3fcad86ef3 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad 5ae5f75b4f Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!574
3 years ago
haroon amjad c05772c63a pharmacy fixes 3 years ago
haroon amjad 432ed4172a Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!573
3 years ago
haroon amjad 2ebff634c4 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad b15bd2362b Updates & fixes 3 years ago
Fatimah Alshammari 7634c35e3d Merge branch 'development_v2.5' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_v2
# Conflicts:
#	lib/widgets/input/text_field.dart
3 years ago
Fatimah Alshammari d7c3cb3dbc fix conflict 3 years ago
haroon amjad 98d50a9b42 Merge branch 'development_v2.5' into haroon_development_2.5 3 years ago
haroon amjad d624136eab Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!572
3 years ago
haroon amjad c2b0326676 Updates & fixes 3 years ago
haroon amjad 98d9839ac2 Merge branch 'haroon_development_2.5' into 'development_v2.5'
Haroon development 2.5

See merge request Cloud_Solution/diplomatic-quarter!571
3 years ago
haroon amjad 3107d1e86d Updates & fixes 3 years ago
haroon amjad eea701907d Login fixes 3 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
3 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
3 years ago
Sikander Saleem c8b5602d8e flutter 2.8 improvements. 3 years ago
Sikander Saleem 3ad90f1a01 Merge branch 'development_new_design_2.0' into development_v2.5 3 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
3 years ago
haroon amjad 7733c74f00 Updates & fixes 3 years ago
Zohaib Iqbal Kambrani 63ffabcc86 no message 3 years ago
Sikander Saleem 684add0090 merge improvements 3 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
3 years ago
haroon amjad c379c6a37b Merge branch 'development_new_design_2.0' into haroon-new-design 3 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
3 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
3 years ago
haroon amjad 4c2410cfd5 Health plugin updated 3 years ago
Fatimah Alshammari 216cc4a7e3 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Fatima-New-Design 3 years ago
Fatimah Alshammari d767febcd0 fix search issue 3 years ago
haroon amjad 7bc8f69dfb JIRA bug fixes 3 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
3 years ago
haroon amjad 2670d0be57 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago