Commit Graph

2168 Commits (a46677f98e48a6c755bdbbd2e082fbbaf3d12dfa)

Author SHA1 Message Date
haroon amjad fe7baeab3c LiveCare permissions 4 years ago
haroon amjad 39190681c6 Updates 4 years ago
haroon amjad e3b7069aa2 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/webRTC/call_page.dart
#	lib/pages/webRTC/signaling.dart
4 years ago
haroon amjad 2274c6affe Merge branch 'zik_new_design_2.0' into 'development_new_design_2.0'
Zik new design 2.0

See merge request Cloud_Solution/diplomatic-quarter!531
4 years ago
haroon amjad 8b1733e917 no message 4 years ago
haroon amjad 003375b12f Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!543
4 years ago
haroon amjad 68b443905e Merge branch 'hussam_pharmacy_fix' into 'development_new_design_2.0'
Hussam pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!544
4 years ago
Sikander Saleem 4518a26ff1 video call improvement. 4 years ago
Fatimah Alshammari 127096ec04 fixed wishlist design 4 years ago
Fatimah Alshammari 21c315c1a3 fix wishlist issue 4 years ago
hussam al-habibeh e6fd5293ca fix filited produvts API 4 years ago
Fatimah Alshammari 7bbabd798a fix issue 4 years ago
Fatimah Alshammari e640f41c35 Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart
#	lib/pages/pharmacies/widgets/ProductOrderItem.dart
4 years ago
Fatimah Alshammari 12b20831df fix app bar 4 years ago
haroon amjad 816dfe4a12 Pharmacy fixes 4 years ago
haroon amjad 2c198ed224 no message 4 years ago
haroon amjad a88889ec1d Merge branch 'nov_fixes' into 'development_new_design_2.0'
small fix in order details

See merge request Cloud_Solution/diplomatic-quarter!540
4 years ago
Elham Rababh 6439fe264a small fix in order details 4 years ago
haroon amjad 17d569216d Merge branch 'Fatima-New-Design' into 'development_new_design_2.0'
Fatima new design

See merge request Cloud_Solution/diplomatic-quarter!539
4 years ago
Fatimah Alshammari 2992ca4f70 fix translation 4 years ago
Fatimah Alshammari bd93395d0f fix order details issue 4 years ago
Fatimah Alshammari c60cf72640 fix lakum design 4 years ago
Fatimah Alshammari 5ae7471d3e fix issue 4 years ago
Fatimah Alshammari 7b44f3487f fix lakum design 4 years ago
Fatimah Alshammari e9a86b4e1c fix lakum 4 years ago
Fatimah Alshammari d25f888c3e Merge branch 'development_new_design_2.0' into Fatima-New-Design
# Conflicts:
#	lib/pages/pharmacies/screens/lakum-main-page.dart
4 years ago
Fatimah Alshammari a858d8764a fixed issues 4 years ago
devmirza121 f9e98c5fa4 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
devmirza121 7d2a6c794b Clinic Search Dialog 4 years ago
haroon amjad 4b446bb6d0 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad b2bb201a34 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad 333b41632c fixes 4 years ago
Sikander Saleem 53e0165286 improvements. 4 years ago
Sikander Saleem 407fb81038 Merge branch 'development_new_design_2.0' into new_design_sikander 4 years ago
Sikander Saleem 7df0fc59df laser images change & offer and packages 4 years ago
haroon amjad 5bb20ea9a2 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 5f0985adaa Updates 4 years ago
Fatimah Alshammari ffc2f2b4bb fix issues 4 years ago
Fatimah Alshammari 1539945a29 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari c87a391a23 fixed wishlist issue 4 years ago
haroon amjad e67e17c2ba Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 7d29ee4468 cart order page fixes 4 years ago
haroon amjad 6d970800f9 Book Appo fix 4 years ago
Fatimah Alshammari a2a6da1527 Merge branch 'development_new_design_2.0' into Fatima-New-Design 4 years ago
Fatimah Alshammari 5dc1561992 fixed notify issue 4 years ago
haroon amjad d0c96d245b Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad a646677fae Pharmacy & smart watch data fixes 4 years ago
Zohaib Iqbal Kambrani 3bd94ee05e Merge branch 'development_new_design_2.0' into zik_new_design_2.0
* development_new_design_2.0:
  fix issues
  Base app client updates
  prescription reminders added
  Medical Reminder 1.0
  lakum fixes
  Medical Reminder
4 years ago
Zohaib Iqbal Kambrani b596b1b61d WebRTC and Packages Offer | Merge 4 years ago
Fatimah Alshammari 468d64a1e0 fix design issue 4 years ago