Commit Graph

1738 Commits (3dbef4095fbf0d4459cdaf33702c05ae66928708)

Author SHA1 Message Date
Sikander Saleem 9fdebc2db7 ask doctor ui redesigned 4 years ago
Fatimah Alshammari b6981299d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 239ad530ce fixed isuues 4 years ago
Mohammad Aljammal 36142f0f6d Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!375
4 years ago
Mohammad Aljammal 8abbb04f02 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!373
4 years ago
mosazaid a2e60e7584 fix bugs pharmacy 4 years ago
haroon amjad e9c26ee85f Dental procedures implemented 4 years ago
Sikander Saleem ca363adee2 merge & improvements 4 years ago
Sikander Saleem 6191377914 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
4 years ago
Mohammad Aljammal 8b3a0b3ada Revert "Merge branch 'foote_in_all_pages' into 'development'"
This reverts merge request !369
4 years ago
Fatimah Alshammari 72ba0c7c74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 4 years ago
Sikander Saleem 9e75a45cd5 improvement. 4 years ago
Sikander Saleem 8367fc09f3 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
4 years ago
Sikander Saleem d605084a91 appointment list and detail ui changed 4 years ago
Sultan Khan b116079843 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 1a501a3b2a calendar events changes 4 years ago
Mirza.Shafique ad025f3d8e Booking appointment 1.2 4 years ago
haroon amjad 0d1d68273b Covid passport CR implemented in Covid test flow 4 years ago
Sultan Khan 4325bd3448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 4 years ago
Mirza.Shafique ba0c0beef6 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique d2b2b4063d Booking appointment 1.1 4 years ago
haroon amjad 72dbdd2c2b Merge branch 'development' into Haroon 4 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 4 years ago
Mohammad Aljammal 68491631f3 Merge branch 'foote_in_all_pages' into 'development'
Foote in all pages

See merge request Cloud_Solution/diplomatic-quarter!369
4 years ago
Zohaib Iqbal Kambrani d33432d238 Covid Drive-Thru Questions Screen 4 years ago
haroon amjad 73097d15de Covid Lab result generate certificate implemented 4 years ago
haroon amjad d83a611d95 FCM Permission fix 4 years ago
Mirza.Shafique bd1cf9bcc7 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByClinic.dart
#	lib/widgets/drawer/app_drawer_widget.dart
4 years ago
Mirza.Shafique 62631677ad Booking appointment 1.0 4 years ago
Sikander Saleem 4152eafa17 Merge branch 'development_new_design_2.0' into new_design_sikander 4 years ago
Sikander Saleem 2ba91e54ab merge-changes 4 years ago
Sikander Saleem 94ff5cff40 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 970887b0c5 changes 4 years ago
Elham Rababh 9777b3f2ab Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 4 years ago
Elham Rababh ceeda154d5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
4 years ago
haroon amjad 5f521556dc Dental flow fixes 4 years ago
Sikander Saleem acd3855c77 Merge branch 'development' into development_new_design_2.0 4 years ago
Sikander Saleem 71f888ea9b improvements 4 years ago
Sikander Saleem 288d64214e improvements 4 years ago
Sikander Saleem bb18645d85 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 3235f489b9 Merge branch 'development' into Haroon 4 years ago
Sikander Saleem 51c398e84a Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem e9db30d3da otp clear when wrong code entered. 4 years ago
haroon amjad 5009e48f64 Updates in Ambulance Request & Covid test 4 years ago
Sultan Khan 301728ed3d family file fix 4 years ago
Mirza.Shafique ca3495d71c Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 0a83cf8241 Bug Fixis 4 years ago
Sultan Khan 59892870e2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 9e31a3c560 bug fixes 4 years ago
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 4 years ago
Mirza.Shafique 374a14eac4 Merge branch 'development_new_design_2.0' into mirza_home_page 4 years ago
Mirza.Shafique 2a4e0a604a Medical Perscription 1.1 4 years ago
haroon amjad 3f29bbd6b3 Updates & fixes 4 years ago
Mohammad Aljammal db128e5091 Merge branch 'blood_pressure' into 'development'
fix prescription add reminder

See merge request Cloud_Solution/diplomatic-quarter!363
4 years ago
Elham Rababh 1fefbfb76e return bottom sheet inside appointments list 4 years ago
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 11ffed2ae3 bug fixes 4 years ago
Elham Rababh 13737548bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages 4 years ago
haroon amjad cbbca5ce86 Merge branch 'development' into Haroon 4 years ago
Sikander Saleem 458dc2474b Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sikander Saleem 047941fffc Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 5647ab75e5 improvements. 4 years ago
Mirza.Shafique b2bba050e8 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/widgets/new_design/doctor_header.dart
4 years ago
Elham Rababh ab2fc6aa2c fix issues related to footer 4 years ago
hussam al-habibeh 428b45528b fix prescription add reminder 4 years ago
Mirza.Shafique 8c8a9c7ce2 Medical Perscription 1.0 4 years ago
Sikander Saleem 350ff20a1a my doctor screen. 4 years ago
Mohammad Aljammal b98a84bcac Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!361
4 years ago
Mohammad Aljammal 41f1704790 Merge branch 'blood_pressure' into 'development'
Blood pressure

See merge request Cloud_Solution/diplomatic-quarter!362
4 years ago
Sikander Saleem ec6693c55e improvement. 5 years ago
haroon amjad 0121337d1b LiveCare Flow from book appointment flow implemented 5 years ago
Mirza.Shafique 24b7a8a4c4 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Sikander Saleem 6c8f1c6185 merge improvement. 5 years ago
Mirza.Shafique cbadcd5feb Vital Sings Detail Page 1.0 5 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
5 years ago
Elham Rababh f85c359cf4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
 Conflicts:
	lib/pages/landing/landing_page.dart
5 years ago
Elham Rababh d028ce22dc remove unused code 5 years ago
hussam al-habibeh fe83b91602 body fat texfield fix 5 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 5 years ago
Mirza.Shafique e91cf4762a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 5 years ago
Sikander Saleem b3fd1cb93d lab result detail flow chart screen & improvement. 5 years ago
hussam al-habibeh 864f849425 Baby age in ovulation period 5 years ago
Fatimah Alshammari 787b55a803 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Fatimah Alshammari 34ccb132dc fixed issues 5 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 5 years ago
Fatimah Alshammari 74d0826342 fixed issues 5 years ago
Sultan khan 04a68c5bd3 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!358
5 years ago
Sultan khan b8d75b5604 Merge branch 'blood_pressure' into 'development'
add blood pressure translation issue

See merge request Cloud_Solution/diplomatic-quarter!356
5 years ago
Sultan khan 6a0acd8afb Merge branch 'fix-bugs' into 'development'
Fix bugs

See merge request Cloud_Solution/diplomatic-quarter!355
5 years ago
Sultan Khan 5b656b0b51 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9610ff640e feedback changes 5 years ago
haroon amjad cbbef80bd5 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
5 years ago
haroon amjad eadba3f767 Working on livecare appointment booking page 5 years ago
hussam al-habibeh b9d4195e20 Blood pressure translation issue 5 years ago
hussam al-habibeh 9c6f83600b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
mosazaid 3077624c58 fix bugs 5 years ago
Sultan khan 3c2a89cd8e Merge branch 'Aug_fixes' into 'development'
fix issues related to wight and  sugar blood

See merge request Cloud_Solution/diplomatic-quarter!354
5 years ago
Sultan khan cd56881d7a Merge branch 'pharmacy-bugs' into 'development'
hide Covid19-driveThrow for patient out of KSA

See merge request Cloud_Solution/diplomatic-quarter!353
5 years ago
Sultan khan 8eb67791ca Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!349
5 years ago
Elham Rababh 8629b62fcb fix issue 5 years ago
Elham Rababh 1568698b98 fix issues related to wight and sugar blood 5 years ago
Sikander Saleem 6ee56cba0d Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/data_display/medical/doctor_card.dart
#	lib/widgets/new_design/doctor_header.dart
5 years ago
Sikander Saleem bb20d65b40 lab result detail screen. 5 years ago
Mirza.Shafique 66efbc1bac Radiology Implementation 5 years ago
hussam al-habibeh 8f5fef87e9 add blood pressure translation issue 5 years ago
Mirza.Shafique 26c30038c9 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique 29fd552874 Weight, height and blood pressure on Home Page 5 years ago
Sikander Saleem 35b5d38b82 Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 3a1af590ff lab result detail screen (cont.) 5 years ago
hussam al-habibeh a33a6b0b2f push request after conflict resolve 5 years ago
hussam al-habibeh 0a3c44b5e8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh 352cda4c70 hide Covid19-driveThrow for patient out of KSA 5 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 5 years ago
haroon amjad 5c8e9f4e19 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!352
5 years ago
haroon amjad 2242b78116 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
5 years ago
haroon amjad e28fdaade1 Dental Invoices implementation completed 5 years ago
Zohaib Iqbal Kambrani c215b22cf7 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fixes
  registration
5 years ago
Zohaib Iqbal Kambrani f442cc251c Pre Post Images Dental Doctor Profile 5 years ago
Mirza.Shafique 876463c945 Home Page Font weight 5 years ago
Sikander Saleem d1b45c8bcc Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
Mirza.Shafique 85c759a4a5 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Sikander Saleem 5b778f0493 appointment ui (cont.) & improvement. 5 years ago
Sultan Khan 1586f02542 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 6b7eaaafb9 fixes 5 years ago
Mirza.Shafique a699740897 Medical File Fonts Implementation 5 years ago
Mirza.Shafique 5f44dece71 Ganaric Font and font implementaion 5 years ago
Fatimah Alshammari bbb8e04066 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 5 years ago
Sultan khan ce867b85f2 Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!347
5 years ago
haroon amjad a32501f3dc My invoices implementation continued 5 years ago
Sikander Saleem ff55ae1908 improvements 5 years ago
Sikander Saleem bb3d11ccf8 remove spaces. 5 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
Sikander Saleem bb9d1bfcd5 improvements 5 years ago
hussam al-habibeh 4b90f16ab9 baby age in ovulation period 5 years ago
Fatimah Alshammari e86dfd1a34 Merge branch 'development' into fatima-new 5 years ago
Fatimah Alshammari 86d67247be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari 0d3f6237ce fixed issues 5 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
5 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 5 years ago
Sultan Khan b1453b52e3 registration 5 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 5 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
5 years ago
hussam al-habibeh d3868844de Medication availability 5 years ago
Mirza.Shafique 1bea9d39b5 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 5 years ago
Sultan Khan 57864f949d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Sultan Khan bd85854fa4 changes 5 years ago
Zohaib Iqbal Kambrani 10a147860c no message 5 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 5 years ago
Sultan Khan 97d7f9225e package name changed 5 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
5 years ago
haroon amjad 90db04cee1 Jira Fixes 5 years ago
Fatimah Alshammari b8ba80b361 Merge branch 'fatima-new' into development 5 years ago
Fatimah Alshammari 39ba2cfde7 fixed issues. 5 years ago
Sikander Saleem 2d64426cd4 Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 70614d3555 merge improvements-1. 5 years ago
haroon amjad 5007064105 Jira fixes 5 years ago
Mirza.Shafique 99c6318410 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 2d62822536 Medical Profile Page improvements 5 years ago
Sikander Saleem f482595d6b merge improvements. 5 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
5 years ago
Mirza.Shafique 4ebf5f900b improvements. 5 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
5 years ago
Mirza.Shafique e9e3b079b3 Medical Profile Complete 1.1 5 years ago
hussam al-habibeh 02df6f4d85 PAP-664 5 years ago
hussam al-habibeh 60aaf2a31a Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
hussam al-habibeh 352fd912de PAP-664 5 years ago
hussam al-habibeh 29249dc9a9 PAP-664 5 years ago
Sultan Khan e5fb16ad69 langauge issue 5 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 5 years ago
Sikander Saleem f6ae7ed770 merge changes-4 5 years ago
Sikander Saleem 889ae24f07 merge changes-3 5 years ago
Sikander Saleem c07a8f54c7 merge changes-2 5 years ago
Sikander Saleem 14561d0ac6 merge changes-1 5 years ago
Sultan Khan c9fe036b99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 7c398ba40d bug fix 5 years ago
Sikander Saleem a5d40f090a improvements-test 5 years ago
hussam al-habibeh 146fc5d2b2 PAP-777 5 years ago
Mirza.Shafique 2665e4cd0c Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 5 years ago
Sikander Saleem 2cb59a286f Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 473315f8a1 improvements 5 years ago
hussam al-habibeh 6ea06ce442 PAP-729 5 years ago
Mirza.Shafique 3c438406b5 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem 53e4815866 no auth ui modifications 5 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 5 years ago
Elham Rababh 8b8e239d3f fix button 5 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 5 years ago
Elham Rababh b01961e45f fix translate issues 5 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan d6fd03b571 CONFIG 5 years ago
Sultan khan 772dcba287 Merge branch 'Aug_fixes' into 'development'
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.

See merge request Cloud_Solution/diplomatic-quarter!338
5 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
5 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 5 years ago
Sultan Khan 6534ca8349 Merge branches 'sultan-patientapp' and 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan khan 54e1d51f18 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!337
5 years ago
Zohaib Iqbal Kambrani 5f1d753895 no message 5 years ago
Sikander Saleem 907d90b987 login ui and forgot password ui added. 5 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Elham Rababh 7ad4e03c1a PAP-715 : Y –axis and X –axis values should be display in the yearly graph details. 5 years ago
Sultan Khan 23ca95b9b6 bug fixes 5 years ago
Mohammad Aljammal 9b3a679948 Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!336
5 years ago
Mohammad Aljammal b34402ffa8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!335
5 years ago
Mohammad Aljammal ed5079e3a0 Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!334
5 years ago
mosazaid e9dbc4be7a fix bugs 5 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
5 years ago
hussam al-habibeh 50d3a42743 fixing dashboard issue 5 years ago
hussam al-habibeh 1ed76e91aa fixing dashboard issue 5 years ago
Sultan Khan 6442ce178d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan khan a67e320a8e Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!333
5 years ago
Sultan Khan 8766a69928 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
hussam al-habibeh d5c76b5400 jira bugs 5 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
5 years ago
hussam al-habibeh 981e78936e jira bugs 5 years ago
Zohaib Iqbal Kambrani 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
5 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
Mohammad Aljammal 4ac6bf628b Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!331
5 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
5 years ago
mosazaid 2e33c2b240 fix bugs 5 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
5 years ago
Mirza.Shafique d37f225c1b Home page 1.2 5 years ago
Sikander Saleem 3707b13986 login type ui & icons added. 5 years ago
Sultan Khan 446f86dbcf Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Elham Rababh 5d05b09345 PAP-712 : fixes on Blood sugar 5 years ago
Sultan Khan c88bea4461 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9acb5b087d bug fixes 5 years ago
Mirza.Shafique 090556f4d1 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 5 years ago
Sikander Saleem 8b2feb03ea last login and login options ui. 5 years ago
Elham Rababh 86414b46fd PAP-304 : show CBC details 5 years ago
Elham Rababh 52816a9cfe PAP-723 : system should display the empty graph in the blood pressure screen. 5 years ago
Elham Rababh f824063e82 PAP-726 : fix show Arabic values for the select Arm 5 years ago
Elham Rababh f92567f877 PAP-718 : fix show data after save 5 years ago
Elham Rababh f830bfdb19 PAP-722 : fix send email 5 years ago
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

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

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

See merge request Cloud_Solution/diplomatic-quarter!326
5 years ago
Sikander Saleem eb9005510d bug fixes and insurance approvals improvements. 5 years ago
Sultan Khan 3c2539d5b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 14ef096c32 changes and fixes 5 years ago
Mirza.Shafique b31813770e Check-In NFC done 5 years ago
Haroon Amjad fde658fd5d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
5 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 5 years ago
Mirza.Shafique e934e7cd2c Merge Fix 5 years ago
haroon amjad 7cf66934bc Merge branch 'Haroon' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 4504b4bf75 config 5 years ago
haroon amjad f310f9d0ab config 5 years ago
haroon amjad 0d2a91c124 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
hussam al-habibeh 8d8fbc3edc jira bugs 5 years ago
Sultan khan 15f620d720 Merge branch 'Jul_fixes' into 'development'
Jul fixes

See merge request Cloud_Solution/diplomatic-quarter!322
5 years ago
hussam al-habibeh fefde8f575 jira bugs 5 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad bcb4f48785 build fix 5 years ago
Sultan khan f048f5229b Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!321
5 years ago
Sultan khan 924f9bedc0 Merge branch 'bug_fixing' into 'development'
Bug fixing

See merge request Cloud_Solution/diplomatic-quarter!319
5 years ago
Sultan khan 10f8ee5e81 Merge branch 'bug_fix_mirza' into 'development'
Bug Fix: 873, 878 to 881

See merge request Cloud_Solution/diplomatic-quarter!320
5 years ago
Sultan Khan 33465b04e5 permission 5 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 5 years ago
Sultan Khan d5d48703f9 camera permission fixed 5 years ago
Sultan Khan 85e803651c permission issue fixed 5 years ago
Sikander Saleem 38f134b6ff Bug PAP-884 fixed, email was not updating. 5 years ago
Sultan Khan b4a7235fc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
hussam al-habibeh 446021eb90 adding doctor list to health calculator 5 years ago
hussam al-habibeh 854352d9ce jira bugs 5 years ago
Sikander Saleem d0c8c4f017 Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen. 5 years ago
Sikander Saleem b2e9060c3f Bug PAP-877 fixed, blood tracker exception. 5 years ago
Elham Rababh 2e1c9780d7 PAP-610: prevent show send email button if user have no vaccine 5 years ago
Elham Rababh c6a68083a4 PAP-667: fix blood type 5 years ago
Elham Rababh c14adccb49 PAP-667: add unit to home page 5 years ago
Elham Rababh dd1dff01d6 PAP-790: fix Alignment of mobile number 5 years ago
Elham Rababh 4217fc0826 PAP-685: fix issue 5 years ago
Sikander Saleem 3128810fb0 improvements. 5 years ago
Sikander Saleem b7fbee3252 improvements 5 years ago
Sikander Saleem d6566d4abf PAP-678 fixed, month & days in axis are aligned now. 5 years ago
Sikander Saleem 1f01f40ad8 PAP-681 fixed, H2O Unit changing & reflection. 5 years ago
Sikander Saleem e41040b1b9 PAP-675 fixed, H2O Week chart vales from -1 to 1. 5 years ago
Sikander Saleem 7771b8f320 PAP-886 fixed, Insurance image button added. 5 years ago
Sikander Saleem db84090694 PAP-872 & PAP-593 fixed, Water addition was not visible. 5 years ago
Sultan Khan da2df9b348 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan bcabd81f88 BUG FIXES 5 years ago
Haroon Amjad e13a13189c Merge branch 'development' into Haroon
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid 865afd7761 fix bugs 5 years ago
Mohammad Aljammal 234e69c02d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!315
5 years ago
hussam al-habibeh bb6e7e931b pharmacy-bugs 5 years ago
Mohammad Aljammal b37dd57804 Merge branch 'pharmacy-Fatima' into 'development'
fixed prescription issue

See merge request Cloud_Solution/diplomatic-quarter!313
5 years ago
Mohammad Aljammal 25d5105caf Merge branch 'Apr-fixes' into 'development'
PAP-607: fix issue

See merge request Cloud_Solution/diplomatic-quarter!312
5 years ago
Fatimah Alshammari b98d8b3a46 fixed prescription issue 5 years ago
Elham Rababah 2a47564c37 PAP-607: fix issue 5 years ago
Mohammad Aljammal 268f0c8fa4 Merge branch 'fix-bugs' into 'development'
fix-design

See merge request Cloud_Solution/diplomatic-quarter!311
5 years ago
Mohammad Aljammal bd451f1283 Merge branch 'Apr-fixes' into 'development'
Apr fixes

See merge request Cloud_Solution/diplomatic-quarter!310
5 years ago
mosazaid 116a4af845 fix-design 5 years ago
Elham Rababah 36d422c7aa PAP-563: fix pickup location from hospital 5 years ago
Elham Rababah aa1c92c142 PAP-562: fix status 5 years ago
hussam al-habibeh 14939d3513 jira bugs (Health Calculator) 5 years ago
Elham Rababah 8c5b3742b6 PAP-643: fix button 5 years ago
Elham Rababah aab33b3e03 PAP-609: fix text align 5 years ago
Fatimah Alshammari 174e0d9673 Merge branch 'development' into pharmacy-Fatima 5 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 5 years ago
Elham Rababah 1f70d086e0 PAP-634: Add search button. 5 years ago
Elham Rababah 9588b134fb PAP-645: resized calculator 5 years ago
Mohammad Aljammal f4f4a0977e Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!307
5 years ago
Fatimah Alshammari ef53338971 Merge branch 'development' into pharmacy-Fatima 5 years ago
Fatimah Alshammari faa8a13778 fixed isuue-product details 5 years ago
Sultan Khan 9adc4a974c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 8c9c309abb bug fixes 5 years ago
Mohammad Aljammal 1607aecb4a Merge branch 'pharmacy-Fatima' into 'development'
fixed an issue in recommended page

See merge request Cloud_Solution/diplomatic-quarter!304
5 years ago
Sultan Khan 3a8b889b74 bug fixes 5 years ago
Sultan Khan 724e0098fb bug fixes 5 years ago
Sultan Khan 1cd4d93488 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan cd7845b1a4 bug fix 5 years ago
Fatimah Alshammari 265d13b970 fixed an issue in recommended page 5 years ago
Zohaib Iqbal Kambrani c7c96f913f no message 5 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
5 years ago
haroon amjad 353a5157f2 fixes 5 years ago
Mohammad Aljammal e04421079e Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!301
5 years ago
Sultan Khan 0245875358 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 3d6858d0ec bug fixes 5 years ago
Elham Rababah 96117fd191 PAP-625: add option “not classified”. 5 years ago
Elham Rababah 6e7f62ca21 PAP-612: show ok and cancel options 5 years ago
Mohammad Aljammal 6fa79ef8d0 Merge branch 'pharmacy-bugs' into 'development'
jira bug PAP-530

See merge request Cloud_Solution/diplomatic-quarter!300
5 years ago
Elham Rababah 66a9239698 PAP-558: Remove the choose Drop-off 5 years ago
Elham Rababah 1b393d6601 PAP-559: remove the km 5 years ago
Elham Rababah 5dd2e9986e PAP-559: fix hospital_service 5 years ago
hussam al-habibeh 1ce10f4d78 jira bug PAP-530 5 years ago
Mohammad Aljammal 0a4f17dc88 Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!298
5 years ago
Mohammad Aljammal dcc98a35ac Merge branch 'fix_advance_payment' into 'development'
fix advance payment

See merge request Cloud_Solution/diplomatic-quarter!299
5 years ago
Mohammad Aljammal 9a850d0ca3 fix advance payment 5 years ago
haroon amjad a6a9a92c6f JIRA bug fixes 5 years ago
Fatimah Alshammari bb622f248c Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy_categorise.dart
5 years ago
Fatimah Alshammari 235fdfba54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 5 years ago
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
haroon amjad 49c454b132 fixes 5 years ago
Mohammad Aljammal 008a39f043 Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!297
5 years ago
Sultan Khan 8e255f1f22 bug fix 5 years ago
Elham Rababah 86dda2b6d6 PAP-560: fix design 5 years ago
Elham Rababah a1ecfbf16a PAP-560: fix design 5 years ago
Elham Rababah efb6ea68b8 PAP-561: fix design 5 years ago
Sultan Khan d4c3b03a5f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 1b770420be bug fixes 5 years ago
Elham Rababah 2e035e2c6b PAP-576: fix design 5 years ago
Elham Rababah fa23c607bd Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar 5 years ago
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 5 years ago
mosazaid e5474b3062 fix perscription pages bugs 5 years ago
Fatimah Alshammari 39daaa16a7 added buttens in categories page 5 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
5 years ago
Mohammad Aljammal 53e4dfa99d Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!292
5 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 5 years ago
Elham Rababah 7bdf31000f PAP-356: fix chart design 5 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
5 years ago
hussam al-habibeh a6ec7326b2 jira bugs 5 years ago
hussam al-habibeh f9b8191a5e jira bugs 5 years ago
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 5 years ago
haroon amjad 9c1fdf96f4 Merge branch 'development' into Haroon 5 years ago
haroon amjad 33e1bf8103 Jira fixes 5 years ago
Mohammad Aljammal a613fe08e4 Merge branch 'fix_theme_issues' into 'development'
fix the line chart issues

See merge request Cloud_Solution/diplomatic-quarter!289
5 years ago
haroon amjad accc39d972 jira bug fixes 5 years ago
Mohammad Aljammal ced7761a32 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_theme_issues 5 years ago
Mohammad Aljammal b36e00d2a5 fix the line chart issues 5 years ago
Sultan Khan 60b1688bb4 chatbot 5 years ago
Sultan Khan 9bfd725e4f bug fixes 5 years ago
Sultan Khan ca2a48e860 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 0445011e53 bug fixes 5 years ago
Mohammad Aljammal ad88f6de04 fix theme issues 5 years ago
haroon amjad 8d16d0a69d Merge branch 'development' into Haroon 5 years ago
haroon amjad 12c4250654 home page ereferral fix 5 years ago
Sultan Khan 35c940a209 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 80d96ba785 Privilege issue fixed 5 years ago
haroon amjad 573f5110f5 Merge branch 'development' into Haroon 5 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
5 years ago
Sultan Khan 616212828d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 66acce3b40 ancillary order pages added 5 years ago
haroon amjad db0fcd51cc pharmacy updates 5 years ago
haroon amjad 74671d2f25 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/order-preview-service.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
5 years ago
haroon amjad e0ebb922ed pharmacy fixes 5 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 5 years ago
mosazaid ed1626f8ee Merge branch 'development' into fix_order_checkout_payment 5 years ago
mosazaid 74dd274502 working on pharmacy some fixes on cart page and request body 5 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
5 years ago
haroon amjad b9a12341d5 updates & fixes 5 years ago
Mohammad Aljammal 4dcb70d7eb Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!282
5 years ago
hussam al-habibeh a534b1415e products filtering fix 5 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
5 years ago
Mohammad Aljammal ec401d4848 Done Ed online 5 years ago
Mohammad Aljammal cacb6722b9 Merge branch 'pharmacy-bugs' into 'development'
daynimic listing

See merge request Cloud_Solution/diplomatic-quarter!279
5 years ago
hussam al-habibeh b39e88d9c8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs 5 years ago
Sultan Khan a6196d3c30 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan b891c1bd80 theme issue 5 years ago
hussam al-habibeh 2723422bbf daynimic listing 5 years ago
haroon amjad 798840ee2f Merge branch 'development' into Haroon 5 years ago
Mohammad Aljammal 123b1de1a4 Merge branch 'pharmacy-bugs' into 'development'
hussam

See merge request Cloud_Solution/diplomatic-quarter!278
5 years ago
Mohammad Aljammal 50a45528d1 Merge branch 'pharmacy-bug-fixes' into 'development'
bug-fixes

See merge request Cloud_Solution/diplomatic-quarter!276
5 years ago
hussam al-habibeh 299a1bed25 hussam 5 years ago
hussam al-habibeh 790fbbcf6c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/pharmacy_categorise.dart
5 years ago