Commit Graph

68 Commits (a8196605362335c1eae52ee14f06e0ada930ce21)

Author SHA1 Message Date
haroon amjad 46d800c0c6 UI updates & fixes 3 years ago
haroon amjad f55fbd1cc2 UI fixes 3 years ago
haroon amjad 4b1a2d4f3d Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ContactUs/findus/hospitrals_page.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
3 years ago
Sikander Saleem 7b8093b7ba Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem c1b23b7c2a improvements 3 years ago
Mirza.Shafique 5b47aaac6f icon and find us distance 3 years ago
haroon amjad 1200dbeb70 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sultan Khan f9f5a886a9 VITAL SIGN FIXED 3 years ago
haroon amjad b1128be94f Updates & fixes 3 years ago
Mirza.Shafique 717c7b3be4 Lab results designs enhancements 3 years ago
haroon amjad f33272f8d9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
haroon amjad ec646a7039 My Invoice fixes, Prescription page fixes 3 years ago
Sultan Khan 169aafa26b hmc services design fixed 3 years ago
Sikander Saleem 120e6c166d Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem c84707ba3f monthly report request & sick leaves ui redesigned. 3 years ago
haroon amjad 9ffe064a3b updates & fixes 3 years ago
Sikander Saleem d1b7c94d6e improvement. 3 years ago
Sikander Saleem d9c1b8b8ea Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/main.dart
#	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
#	lib/pages/medical/eye/EyeMeasurementsPage.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
haroon amjad 4469ae1209 updates & fixes 3 years ago
haroon amjad 4560037f97 updates 3 years ago
Sikander Saleem ec6693c55e improvement. 3 years ago
Sikander Saleem 197e7d5742 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/patient_sick_leave_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
Sikander Saleem b3fd1cb93d lab result detail flow chart screen & improvement. 3 years ago
haroon amjad 2242b78116 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
3 years ago
haroon amjad a32501f3dc My invoices implementation continued 3 years ago
Zohaib Iqbal Kambrani 429fcb1e60 Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
  changes
  package name changed
  Jira Fixes
  Jira fixes
  PAP-664
  PAP-664
  PAP-664
  langauge issue
  bug fix
  PAP-777
  PAP-729
  fix button
  fix translate issues
  CONFIG
  PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
  bug fixes
  fix bugs
  fixing dashboard issue
  fixing dashboard issue
  jira bugs
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 3 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 3 years ago
Sikander Saleem 14561d0ac6 merge changes-1 3 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 3 years ago
Sultan khan a67e320a8e Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!333
3 years ago
hussam al-habibeh d5c76b5400 jira bugs 3 years ago
hussam al-habibeh 6dc0d89f61 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
	lib/uitl/utils.dart
3 years ago
hussam al-habibeh 981e78936e jira bugs 3 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
3 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
3 years ago
mosazaid 2e33c2b240 fix bugs 3 years ago
Mirza.Shafique d37f225c1b Home page 1.2 3 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 3 years ago
Zohaib Iqbal Kambrani dbf525c484 no message 3 years ago
Zohaib Iqbal Kambrani c7c96f913f no message 4 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 4 years ago
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
4 years ago
Sultan Khan 60b1688bb4 chatbot 4 years ago
Sultan Khan 9bfd725e4f bug fixes 4 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 4 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 4 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 4 years ago
Zohaib Iqbal Kambrani e2bce87e34 resolve merge conflicts. 4 years ago