Commit Graph

967 Commits (a60f66a0691b5beaf802425bdf85a35ca60febfe)

Author SHA1 Message Date
Mohammad Aljammal b53bd5fd62 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile
 Conflicts:
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Mohammad Aljammal 43e7bb9ff3 fix bottom navigation bar 4 years ago
mosazaid a398ede172 fix bugs pharmacy home 4 years ago
hussam al-habibeh 2265487ccd remove cart cout & icon from AppBar 4 years ago
Elham Rababh 769dc4e0ac first step of ProductDetailPage refactor 4 years ago
Elham Rababh a269b514a9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababh c7a0d39aab first step of ProductDetailPage refactor 4 years ago
Mohammad Aljammal d64e2a469f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 4 years ago
Mohammad Aljammal 8ecd4a24d8 fix product tile 4 years ago
Mohammad Aljammal 8c7f397ac8 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!397
4 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 4 years ago
Elham Rababh a6a7ed4e1b remove cart from product details 4 years ago
haroon amjad 0955a22616 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 46d800c0c6 UI updates & fixes 4 years ago
Mirza.Shafique ef8006efd8 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
#	lib/pages/Covid-DriveThru/covid-dirvethru-questions.dart
#	lib/pages/Covid-DriveThru/covid-payment-alert.dart
#	lib/pages/Covid-DriveThru/covid-payment-details.dart
#	lib/pages/Covid-DriveThru/covid-payment-summary.dart
4 years ago
Mirza.Shafique 5b330b2a25 Covid New Design 4 years ago
Sikander Saleem c96fa62363 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem e36e0ce0b7 h20 bottom nav bar bug fix (happen in release mode) 4 years ago
hussam al-habibeh 7427cd68ff fix bottom nav bar ui 4 years ago
haroon amjad b0f4cfcff3 Family file fixes 4 years ago
haroon amjad 2fc5425884 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad f55fbd1cc2 UI fixes 4 years ago
haroon amjad a075d53dd5 UI updates & fixes 4 years ago
Sultan Khan a57facb876 family file fix 4 years ago
haroon amjad af7b27258c Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sultan Khan 0e43ca173a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan d535cb421d bug fixes 4 years ago
haroon amjad 4ac0845003 updates & fixes 4 years ago
haroon amjad bbcf22ddfa Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/landing/fragments/home_page_fragment2.dart
4 years ago
haroon amjad 92bfe27a6e updates & fixes 4 years ago
Sikander Saleem 8e27d8210a prescription detail ui changes. 4 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
4 years ago
Sikander Saleem 9d67704c67 prescription detail ui changes(cont). 4 years ago
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
4 years ago
haroon amjad b3dffc992c App expandable fixes 4 years ago
haroon amjad a2e25f7a7a Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
Sikander Saleem f0bb94c422 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mirza.Shafique 999a45c711 App Expendable Design Change 4 years ago
haroon amjad 322a32be21 WebRTC Implementing 4 years ago
haroon amjad e8bb4e962c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
4 years ago
Mirza.Shafique ad3fbdf323 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 717c7b3be4 Lab results designs enhancements 4 years ago
Zohaib Iqbal Kambrani 581bbe63bb Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
* 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  Images deleted from assets
  CMC 1.7
  CMC 1.6
  CMC 1.5
4 years ago
Zohaib Iqbal Kambrani 3f178e3e3f Google_Huawei Map -> AppMap 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 4 years ago
Mirza.Shafique a67c5afcfb Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique e890c80831 CMC 1.3 4 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 4 years ago
haroon amjad ec646a7039 My Invoice fixes, Prescription page fixes 4 years ago
Mirza.Shafique 82a1d410db Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/landing/widgets/logged_slider_view.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 2019e804f0 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Mirza.Shafique 831780555c CMC 1.0 4 years ago
haroon amjad aadcfdc7bc Insurance Approval fixes 4 years ago
haroon amjad 5396138962 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/ToDoList/payment_method_select.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
haroon amjad 3bb0a8b85b Apple Pay finalized, Translation issues fixed, other updates 4 years ago
Sikander Saleem aa047afef7 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/BookAppointment/components/SearchByClinic.dart
4 years ago
Mirza.Shafique 3af1676730 Merge branch 'development_new_design_2.0' into mirza_home_page
# Conflicts:
#	lib/pages/insurance/insurance_card_screen.dart
#	lib/pages/medical/balance/advance_payment_page.dart
#	lib/pages/medical/balance/confirm_payment_page.dart
4 years ago
Mirza.Shafique a234618df8 Update, Insurance card and My Balance Design 4 years ago
Sikander Saleem 1db8c96ed7 title improvement for book appointment clinic search. 4 years ago
haroon amjad ebcc2559ce Ask doctor issue resolved, Translation & font family issues resolved 4 years ago
haroon amjad 25fb5decc0 Ask Doctor page fixes 4 years ago
Sultan Khan 671c432cd7 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan 0086875d0d Design Updated for tracker 4 years ago
Sikander Saleem a09b43ef8c monthly report ui redesigned. 4 years ago
Sikander Saleem 120e6c166d Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
haroon amjad 9ffe064a3b updates & fixes 4 years ago
Sikander Saleem cd85ad4f8a feedback ui redesigned. 4 years ago
Fatimah Alshammari 62167baec5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 6d72be2a73 fixed cart order issues 4 years ago
Sultan Khan d2d22ff1fc Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan 73ff5c4707 Bug fixes 4 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
4 years ago
haroon amjad 4469ae1209 updates & fixes 4 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 4 years ago
Mirza.Shafique 4f85652562 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique f577905dcb eye measurment new design 4 years ago
haroon amjad e679c7df0d updates & fixes 4 years ago
haroon amjad a10253736a Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
4 years ago
haroon amjad 44d59ed01a updates & fixes 4 years ago
Sikander Saleem e3758cfbba Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem ff5fbbdf7c Service info app bar fixed. 4 years ago
Sikander Saleem fab051f9e7 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
4 years ago
Sikander Saleem 6a86d8d1c1 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Sikander Saleem 62ca009404 improvement. 4 years ago
Sultan Khan 52665fe217 login issue fixed 4 years ago
Fatimah Alshammari 827d8733a1 fixed shopping cart issue 4 years ago
Sikander Saleem bf920d4188 find us redesigned. 4 years ago
Sikander Saleem 1c020134e8 Merge branch 'new_design_sikander' into development_new_design_2.0 4 years ago
Mirza.Shafique 089ad0d321 Booking appointment 1.3 4 years ago
Sikander Saleem cfa3ca62b6 prescription tab bar improvement. 4 years ago
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
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
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
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
haroon amjad 73097d15de Covid Lab result generate certificate implemented 4 years ago
Mirza.Shafique 62631677ad Booking appointment 1.0 4 years ago
Sikander Saleem 970887b0c5 changes 4 years ago
Sikander Saleem 71f888ea9b improvements 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
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
Sikander Saleem 5ab9dd1761 Appointment screen Changes & improvements. 4 years ago
haroon amjad 3f29bbd6b3 Updates & 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
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
Mirza.Shafique 8c8a9c7ce2 Medical Perscription 1.0 4 years ago
Sikander Saleem ec6693c55e improvement. 4 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
4 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
4 years ago
Elham Rababh 69df61afb1 remove footer from pharmacy pages 4 years ago
Mirza.Shafique e91cf4762a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Mirza.Shafique d865e97ce1 Vital Sings Home Page 4 years ago
Sikander Saleem b3fd1cb93d lab result detail flow chart screen & improvement. 4 years ago
Fatimah Alshammari 74d0826342 fixed issues 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
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 3a1af590ff lab result detail screen (cont.) 5 years ago
Elham Rababh 8626b4f269 first step from add footer for all pages 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
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
Sikander Saleem ff55ae1908 improvements 5 years ago
Sikander Saleem bb9d1bfcd5 improvements 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
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
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
Zohaib Iqbal Kambrani 10a147860c no message 5 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 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
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 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
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 7c398ba40d bug fix 5 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 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
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 5 years ago
Sultan Khan d6fd03b571 CONFIG 5 years ago
Sikander Saleem 907d90b987 login ui and forgot password ui added. 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
mosazaid 2e33c2b240 fix bugs 5 years ago
Mirza.Shafique d37f225c1b Home page 1.2 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
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
Sultan Khan 14ef096c32 changes and fixes 5 years ago
Mirza.Shafique b31813770e Check-In NFC done 5 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 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
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 5 years ago
Sultan Khan b4a7235fc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sikander Saleem d0c8c4f017 Bug PAP-671, PAP-672 fixed, bottom nav added on H2O screen. 5 years ago
Sikander Saleem d6566d4abf PAP-678 fixed, month & days in axis are aligned now. 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
Mohammad Aljammal bd451f1283 Merge branch 'Apr-fixes' into 'development'
Apr fixes

See merge request Cloud_Solution/diplomatic-quarter!310
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 9588b134fb PAP-645: resized calculator 5 years ago
Sultan Khan cd7845b1a4 bug fix 5 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
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
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
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
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 fa23c607bd Merge branches 'development' and 'fix_bugs_Mar' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_bugs_Mar 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
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 5 years ago
Sultan Khan 9bfd725e4f bug fixes 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 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 e0ebb922ed pharmacy fixes 5 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 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
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
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
5 years ago
Mohammad Aljammal 576181a72e Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!251
5 years ago
Sultan Khan 6f68cf5a15 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Fatimah Alshammari a46dddea9a Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/model/pharmacies/order_model.dart
#	lib/pages/pharmacies/product-brands.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/profile/profile.dart
5 years ago
mosazaid dfeb70c892 Merge branch 'development' into pharmacy-payment-feature
# Conflicts:
#	lib/pages/pharmacy/order/OrderDetails.dart
5 years ago
mosazaid 0b2002d4dd finish payment order 5 years ago
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 5 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 5 years ago
mosazaid f3cdd08857 adding fharmacy payment feature 5 years ago
enadhilal 0cb493d56c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/pages/pharmacies/product_detail.dart
5 years ago
enadhilal 0c6fb67718 fixed issues 5 years ago
Zohaib Iqbal Kambrani 63663f1b24 Track Delivery Driver Completed 5 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 5 years ago
Sultan Khan 144ef52c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan b3e6c4efda voice command changes 5 years ago
enadhilal 60648d368f Merge branch 'development' into enad_pharmacy2 5 years ago
enadhilal 830e871e2c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
5 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 5 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9fca52efca voice command 5 years ago
Sultan Khan eeb073fb17 voice command 5 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
5 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 5 years ago
Mohammad Aljammal 1d724a8db6 Merge branch 'h2o_improvement' into 'development'
H2o improvement

See merge request Cloud_Solution/diplomatic-quarter!259
5 years ago
Sikander Saleem aef4c7bfac H2O feature improvement 5 years ago
haroon amjad 0b83089b86 Merge branch 'development' into Haroon 5 years ago
Sikander Saleem 3b4e791017 H2O feature improvement 5 years ago
Mohammad Aljammal ab53ca82b1 fix colors issues 5 years ago
haroon amjad 3bad0a3804 Merge branch 'development' into Haroon 5 years ago
haroon amjad 146019432a LiveCare schedule implemented 5 years ago
Sultan Khan 3ac69692be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Mohammad Aljammal 3e441c55b2 fix bottom nav bar 5 years ago
Mohammad Aljammal 9d8c1ddf63 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
 Conflicts:
	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 5 years ago
haroon amjad dde10cd27b working in LiveCare Scheduling 5 years ago
Mohammad Aljammal db2376f50c fix blood and weight on my trackers 5 years ago
Sultan Khan ccd2fc5068 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 68f7a9ff9c login chnages 5 years ago
Zohaib Iqbal Kambrani 9a5daed5c3 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  re-design child vaccine and fix some funcrionalities
  Fix ER service
  first step from fix CMC
  fix issue on cmc
  return CMC HHC
  Nearest Er fix design
  solving NearestEr design problem
  simple fix
  hot fixing
  fix design issues

# Conflicts:
#	lib/config/localized_values.dart
5 years ago
Sultan Khan c65983bfdb code merged 5 years ago
Sultan Khan 86cf9300e1 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
* 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter: (136 commits)
  Fix ER service
  first step from fix CMC
  fix issue on cmc
  return CMC HHC
  Nearest Er fix design
  solving NearestEr design problem
  simple fix
  hot fixing
  fix design issues
  some design enhancments
  fix design
  fix android
  fix merge issues
  fix merge issues
  commit
  fix merge issues
  change color
  return privilege
  return privilege
  fix issues
  ...
5 years ago
Mohammad Aljammal 200334d8f8 Fix ER service 5 years ago
Elham Rababah c9edb37a3c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah d7a046f9ca fix issue on cmc 5 years ago
Mohammad Aljammal b63025a9b3 return CMC HHC 5 years ago
Mohammad Aljammal 30ddea6419 hot fixing 5 years ago
Zohaib Iqbal Kambrani dc83b476d6 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts:
#	android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
#	ios/Flutter/.last_build_id
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal ed729689a9 Merge branch 'design_issues' into 'development'
fix design issues

See merge request Cloud_Solution/diplomatic-quarter!237
5 years ago
Mohammad Aljammal 634c874eee fix design issues 5 years ago
mosazaid 2843b1393e some design enhancments 5 years ago
Mohammad Aljammal 72290f041f fix design 5 years ago
Mohammad Aljammal de1b7cc1d0 fix merge issues 5 years ago
Mohammad Aljammal 3fb522e15f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
	lib/core/model/pharmacies/order_model.dart
	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
	lib/locator.dart
	lib/main.dart
	lib/pages/landing/landing_page_pharmcy.dart
	lib/pages/parent_categorise_page.dart
	lib/pages/pharmacies/screens/cart-order-page.dart
	lib/pages/pharmacies/screens/cart-order-preview.dart
	lib/pages/pharmacies/screens/pharmacy_module_page.dart
	lib/pages/pharmacies/wishlist.dart
	lib/pages/pharmacy/order/Order.dart
	lib/pages/pharmacy/order/OrderDetails.dart
	lib/pages/pharmacy/order/ProductReview.dart
	lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
	lib/pages/pharmacy/profile/profile.dart
	lib/services/pharmacy_services/orderDetails_service.dart
	lib/services/pharmacy_services/order_service.dart
	lib/services/pharmacy_services/pharmacyAddress_service.dart
	lib/services/pharmacy_services/wishList_service.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/borderedButton.dart
	lib/widgets/others/app_scaffold_widget.dart
	lib/widgets/pharmacy/product_tile.dart
5 years ago
Mohammad Aljammal 16d1f667d4 Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
 Conflicts:
	android/app/build.gradle
	lib/config/config.dart
	lib/pages/pharmacy/profile/profile.dart
	lib/widgets/pharmacy/product_tile.dart
5 years ago
mosazaid 38d58ebaaf Merge branch 'pharmacy' into pharmacy_mosa_branch
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
#	lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
#	lib/services/pharmacy_services/pharmacyAddress_service.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal 952e106531 return privilege 5 years ago
Mohammad Aljammal f77d2b497e fix issues 5 years ago
Mohammad Aljammal 18dad434a0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/weather_service.dart
	lib/core/viewModels/dashboard_view_model.dart
	lib/main.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
	lib/pages/BookAppointment/Search.dart
	lib/pages/ErService/AmbulanceReq.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/pages/login/register.dart
	lib/pages/medical/allergies_page.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/doctor/doctor_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
	lib/uitl/location_util.dart
	lib/widgets/drawer/app_drawer_widget.dart
	pubspec.yaml
5 years ago
enadhilal 10734d5994 connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
5 years ago
Mohammad Aljammal 6bda03e935 hot fixing 5 years ago
Sultan Khan c01246acf0 hot fix 5 years ago
Mohammad Aljammal 519a474d41 fix live care label and vital sign data 5 years ago
Fatimah Alshammari c0920e7099 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 5 years ago
Sultan Khan c9538c6a84 family files 5 years ago
Sultan Khan 73c8e00852 bug fixes 5 years ago
Sultan Khan 18f492e52f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan d53031b0e6 blood type update for family files 5 years ago
Mohammad Aljammal 2059b76fc1 fix Medical profile 5 years ago
Mohammad Aljammal 4d8f42b517 fix issues vital sign issue 5 years ago
Mohammad Aljammal f6983c138a fix issues 5 years ago
Mohammad Aljammal 09a85d9127 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 5 years ago
Fatimah Alshammari e5bf7acc52 Merge branch 'pharmacy-Fatima' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-Fatima
# Conflicts:
#	lib/core/viewModels/pharmacyModule/order_model_view_model.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/widgets/pharmacy/product_tile.dart
5 years ago
Fatimah Alshammari fda101840a fixed order isuues 5 years ago
Sultan Khan 6b1e7587a8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan a0baaac314 bug fixes 5 years ago
Zohaib Kambrani d8bd7d145d no message 5 years ago
Mohammad Aljammal a8b0af9ee1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 5 years ago
Mohammad Aljammal 9c18c69d90 hot fixes 5 years ago
haroon amjad ac3bebd59e Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 years ago
haroon amjad 8c9762c24f Fixes 5 years ago
Sultan Khan 040c8f38ab hot fixes 5 years ago
Mohammad Aljammal 7bc8fdb819 fix merge issues 5 years ago
Mohammad Aljammal 6d7cb1b970 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
 Conflicts:
	ios/Runner.xcodeproj/project.pbxproj
	lib/core/service/AuthenticatedUserObject.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/widgets/drawer/app_drawer_widget.dart
5 years ago
Mohammad Aljammal 7167d58ce2 fix merge issues 5 years ago
Mohammad Aljammal aa89a05f1d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	ios/Flutter/.last_build_id
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/medical/prescriptions_service.dart
	lib/core/viewModels/project_view_model.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/BookAppointment/BookConfirm.dart
	lib/pages/BookAppointment/DoctorProfile.dart
	lib/pages/DrawerPages/family/my-family.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/pages/MyAppointments/models/ArrivedButtons.dart
	lib/pages/MyAppointments/widgets/AppointmentActions.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/feedback/send_feedback_page.dart
	lib/pages/insurance/insurance_approval_screen.dart
	lib/pages/insurance/insurance_card_screen.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/confirm-login.dart
	lib/pages/login/login.dart
	lib/pages/medical/balance/my_balance_page.dart
	lib/pages/medical/labs/laboratory_result_page.dart
	lib/pages/medical/labs/labs_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/patient_sick_leave_page.dart
	lib/pages/medical/prescriptions/prescription_details_page.dart
	lib/pages/medical/prescriptions/prescription_items_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/pages/medical/radiology/radiology_home_page.dart
	lib/pages/medical/reports/report_home_page.dart
	lib/pages/medical/reports/reports_page.dart
	lib/pages/pharmacies/pharmacies_list_screen.dart
	lib/pages/settings/profile_setting.dart
	lib/services/authentication/auth_provider.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/buttons/floatingActionButton.dart
	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
	lib/widgets/data_display/medical/doctor_card.dart
	lib/widgets/drawer/app_drawer_widget.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
mosazaid 359eba2da0 make some updates in firebase version and update gradle, finish review order 5 years ago
Sultan Khan eec67ac930 big fixes 5 years ago
Mohammad Aljammal b29fdbb7d0 fix home issues 5 years ago
Mohammad Aljammal d9759560c3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/login/login.dart
5 years ago
Mohammad Aljammal 02d72fa27c fix issues 5 years ago
Fatimah Alshammari 4a84483698 fixed order details 5 years ago
Sultan Khan 3aa592e2b0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 9a578cafc2 bug fixes 5 years ago
Sultan Khan b759758a68 bug fixes 5 years ago
Mohammad Aljammal 3860a08b53 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix issues

See merge request Cloud_Solution/diplomatic-quarter!188
5 years ago
Mohammad Aljammal f38f53587b fix issues 5 years ago
Sultan Khan 9e3db622fa login loader issue fixed 5 years ago
Zohaib Kambrani 6f6ab8d987 no message 5 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 5 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 5 years ago
haroon amjad 965c97d262 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Sultan Khan d779c6dd0a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan a2e385f282 family file drawer 5 years ago
Haroon Amjad b9269f525a hot fixes 5 years ago
Haroon Amjad 5606c88715 hot fixes 5 years ago
Haroon Amjad 81b51bef51 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 5 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad b13a56ffbd Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 951d9b553f fixes & updates 5 years ago
Sultan Khan 71592adf32 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 1f0d01b6cc language issue fixed 5 years ago
Sultan Khan 2c50402aa8 language issue fixed 5 years ago