Commit Graph

708 Commits (9d67704c67c94ddcbe7e7cee8cd27f4c3ed2b78a)

Author SHA1 Message Date
Mirza.Shafique 5f44dece71 Ganaric Font and font implementaion 3 years ago
haroon amjad a32501f3dc My invoices implementation continued 3 years ago
Sikander Saleem ff55ae1908 improvements 3 years ago
Sikander Saleem bb3d11ccf8 remove spaces. 3 years ago
Sikander Saleem bb9d1bfcd5 improvements 3 years ago
Sikander Saleem 80c50e29bf Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/landing_page.dart
3 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 3 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 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
hussam al-habibeh d3868844de Medication availability 3 years ago
Mirza.Shafique 1bea9d39b5 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 3 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 3 years ago
Sultan Khan 97d7f9225e package name changed 3 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
3 years ago
haroon amjad 90db04cee1 Jira Fixes 3 years ago
Sikander Saleem 2d64426cd4 Merge branch 'login_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 70614d3555 merge improvements-1. 3 years ago
Mirza.Shafique 99c6318410 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 2d62822536 Medical Profile Page improvements 3 years ago
Sikander Saleem f482595d6b merge improvements. 3 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique 4ebf5f900b improvements. 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 f6ae7ed770 merge changes-4 3 years ago
Sikander Saleem c07a8f54c7 merge changes-2 3 years ago
Sultan Khan 7c398ba40d bug fix 3 years ago
Mirza.Shafique 3c438406b5 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 3 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 3 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan d6fd03b571 CONFIG 3 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
3 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 3 years ago
Sikander Saleem 907d90b987 login ui and forgot password ui added. 3 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 23ca95b9b6 bug fixes 3 years ago
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
3 years ago
Sultan Khan 6442ce178d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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
Sultan Khan 8766a69928 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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 4abdd9bde7 no message 3 years ago
Mirza.Shafique b0dfbef52a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique d37f225c1b Home page 1.2 3 years ago
Sikander Saleem 3707b13986 login type ui & icons added. 3 years ago
Sultan Khan c88bea4461 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 9acb5b087d bug fixes 3 years ago
Sikander Saleem 8b2feb03ea last login and login options ui. 3 years ago
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

See merge request Cloud_Solution/diplomatic-quarter!329
3 years ago
Sultan khan f54b9a63aa Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!328
3 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 3 years ago
Haroon Amjad 213d104d57 Covid test procedure selection implemented 3 years ago
Sultan khan 487d63ec7f Merge branch 'bug_fix_mirza' into 'development'
Check-In NFC

See merge request Cloud_Solution/diplomatic-quarter!326
3 years ago
Sikander Saleem eb9005510d bug fixes and insurance approvals improvements. 3 years ago
Sultan Khan 3c2539d5b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 14ef096c32 changes and fixes 3 years ago
Mirza.Shafique b31813770e Check-In NFC done 3 years ago
Haroon Amjad fde658fd5d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
3 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 3 years ago
Mirza.Shafique e934e7cd2c Merge Fix 3 years ago
haroon amjad 4504b4bf75 config 3 years ago
haroon amjad f310f9d0ab config 3 years ago
haroon amjad 0d2a91c124 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
hussam al-habibeh fefde8f575 jira bugs 3 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 3 years ago
haroon amjad bcb4f48785 build fix 3 years ago
Sultan Khan b4a7235fc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
hussam al-habibeh 854352d9ce jira bugs 3 years ago
Sikander Saleem 1f01f40ad8 PAP-681 fixed, H2O Unit changing & reflection. 3 years ago
Sultan Khan da2df9b348 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan bcabd81f88 BUG FIXES 3 years ago
Mohammad Aljammal 25d5105caf Merge branch 'Apr-fixes' into 'development'
PAP-607: fix issue

See merge request Cloud_Solution/diplomatic-quarter!312
4 years ago
Elham Rababah 2a47564c37 PAP-607: fix issue 4 years ago
Fatimah Alshammari 174e0d9673 Merge branch 'development' into pharmacy-Fatima 4 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 4 years ago
Sultan Khan 8c9c309abb bug fixes 4 years ago
Sultan Khan cd7845b1a4 bug fix 4 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
4 years ago
haroon amjad 353a5157f2 fixes 4 years ago
Sultan Khan 0245875358 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 3d6858d0ec bug fixes 4 years ago
Fatimah Alshammari 235fdfba54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 4 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 4 years ago
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
4 years ago
haroon amjad 49c454b132 fixes 4 years ago
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 4 years ago
mosazaid e5474b3062 fix perscription pages bugs 4 years ago
Mohammad Aljammal 126fad61c0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
 Conflicts:
	lib/core/service/client/base_app_client.dart
4 years ago
Mohammad Aljammal 53e4dfa99d Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!292
4 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 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
hussam al-habibeh f9b8191a5e jira bugs 4 years ago
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 4 years ago
haroon amjad 9c1fdf96f4 Merge branch 'development' into Haroon 4 years ago
haroon amjad 33e1bf8103 Jira fixes 4 years ago
haroon amjad accc39d972 jira bug fixes 4 years ago
Sultan Khan ca2a48e860 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 0445011e53 bug fixes 4 years ago
Mohammad Aljammal ad88f6de04 fix theme issues 4 years ago
haroon amjad 454957ebba Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
4 years ago
Sultan Khan 616212828d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 66acce3b40 ancillary order pages added 4 years ago
haroon amjad e0ebb922ed pharmacy fixes 4 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 4 years ago
haroon amjad ed3dba3eb3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad b9a12341d5 updates & fixes 4 years ago
Mohammad Aljammal 4dcb70d7eb Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!282
4 years ago
hussam al-habibeh a534b1415e products filtering fix 4 years ago
Mohammad Aljammal 861dba9a94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal ec401d4848 Done Ed online 4 years ago
Sultan Khan a6196d3c30 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan b891c1bd80 theme issue 4 years ago
Fatimah Alshammari 747763c4be Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 4 years ago
Fatimah Alshammari c629fcb85c fixed recommended products new design 4 years ago
enadhilal 0cb493d56c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/pages/pharmacies/product_detail.dart
4 years ago
Fatimah Alshammari 42bf76f712 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Zohaib Iqbal Kambrani 15ec3ec9b9 Translation Track Driver, enhancement, initial camera 4 years ago
Zohaib Iqbal Kambrani 63663f1b24 Track Delivery Driver Completed 4 years ago
Fatimah Alshammari ac32ba998c fixed order isuee 4 years ago
Zohaib Iqbal Kambrani 516df96e21 no message 4 years ago
Mohammad Aljammal e6da54c201 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 20ad10b9dc Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 4 years ago
mosazaid 1a45f99606 some fixes on pharmacy 4 years ago
haroon amjad 5e8e3806d6 Covid Drive-Thru implemented 4 years ago
Sultan Khan 144ef52c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan b3e6c4efda voice command changes 4 years ago
enadhilal 830e871e2c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
4 years ago
mosazaid b70c7d7d05 fix pharmacy auth 4 years ago
enadhilal 292e983614 fixing issues 4 years ago
Mohammad Aljammal 87ad027d33 Merge branch 'improve_hhc' into 'development'
Improve hhc

See merge request Cloud_Solution/diplomatic-quarter!264
4 years ago
Mohammad Aljammal 29f4e6acb6 Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing

See merge request Cloud_Solution/diplomatic-quarter!262
4 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
Fatimah Alshammari ef8312f2b8 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/pharmacies/product_detail.dart
4 years ago
Fatimah Alshammari ce64da11e4 homepage and product details design 4 years ago
mosazaid cbe422cbc6 Merge branch 'hmg-services-fixing' into development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
mosazaid 0444b21101 Merge branch 'development' into hmg-services-fixing
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababah 94ee969406 hhc msg translation 4 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Mohammad Aljammal e964afd4f2 Merge branch 'fix_security_issue' into 'development'
fix security issues in pharmacy

See merge request Cloud_Solution/diplomatic-quarter!261
4 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 4 years ago
Sikander Saleem aef4c7bfac H2O feature improvement 4 years ago
haroon amjad 0b83089b86 Merge branch 'development' into Haroon 4 years ago
haroon amjad 3832cee1ad Translation fixes 4 years ago
Sikander Saleem 3b4e791017 H2O feature improvement 4 years ago