Commit Graph

1310 Commits (f2bf8edeb2f6d418c0edb4459f98c2ad53d59f9a)

Author SHA1 Message Date
haroon amjad f03939b9d0 Merge branch 'master' into haroon_dev 3 months ago
Aamir Muhammad 8365d2c4ee Image Functionality & Discounts & Offers 3 months ago
haroon amjad 49d3e53eb3 Merge branch 'master' into haroon_dev 3 months ago
haroon amjad 82dad582c4 Updates 3 months ago
Aamir Muhammad 1ff91bb159 Image Functionality & Discounts & Offers 3 months ago
Aamir Muhammad c77ee66c3a Image Functionality & Discounts & Offers 3 months ago
Aamir Muhammad 4fd2312e61 Merge branch 'refs/heads/master' into offers_discounts
# Conflicts:
#	lib/presentation/my_family/widget/family_cards.dart
3 months ago
Aamir Muhammad 4a384efd2d Image Functionality & Discounts & Offers 3 months ago
Aamir Muhammad 2b53cce0aa Merge branch 'refs/heads/master' into offers_discounts
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/my_family/widget/family_cards.dart
3 months ago
Aamir Muhammad 7cd1d84ff6 Image Functionality & Discounts & Offers 3 months ago
haroon amjad 227dd407f5 Updates 3 months ago
haroon amjad 91876f2b6b profile image added in review appointments page 3 months ago
faizatflutter 64da8f1804 Merge branch 'master' into faiz_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/core/dependencies.dart
#	lib/features/habib_wallet/habib_wallet_view_model.dart
#	lib/generated/locale_keys.g.dart
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
3 months ago
faizatflutter 67bb3895e2 Refund Module almost done 3 months ago
Haroon Amjad b49e1a222b Added sharedpref on no thanks option in symptom checker bottom sheet 3 months ago
Haroon6138 c29632ffc0 Merge pull request 'haroon_dev' (#317) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/317
3 months ago
haroon amjad 4015f5ba2e PayTabs Card & Apple Pay Payment integration completed. 3 months ago
faizatflutter 198280fbde Refund Request and Withdraw Module In Progress! 3 months ago
haroon amjad 155916b1a8 Paytabs implementation contd. 3 months ago
tahaalam 87b6e055da organs added for the medication input 3 months ago
Haroon Amjad cdc82c83f8 Paytabs implemented in Wallet payment 3 months ago
haroon amjad 0db762fa2c Paytabs implementation contd. 3 months ago
haroon amjad 73066ba21a Update & fixes, App update to stores VersionID 21.2 3 months ago
haroon amjad 92213b03e4 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev 3 months ago
haroon amjad 2877bb3995 updates 3 months ago
Haroon Amjad 71562f6441 updates 3 months ago
Haroon Amjad 9ead2cacaf updates & fixes 3 months ago
haroon amjad 4329aa05ad update to stores, VersionID 21.2 3 months ago
faizatflutter 8aa152f1a0 added apis 3 months ago
haroon amjad f7d415b7eb LocationID updates 3 months ago
haroon amjad a9d085098f Pharmacy invoice implemented 3 months ago
faizatflutter 7cf593443d Refund Request Started 3 months ago
haroon amjad 469479d7cb updates 3 months ago
haroon amjad 9986729ba5 Updates & fixes 3 months ago
haroon amjad c9e602cfa3 updates & fixes 3 months ago
haroon amjad 9d04133b8d Lakum integration completed 3 months ago
haroon amjad 40a0ecdda4 Lakum integration contd. 4 months ago
haroon amjad 285287e596 crashlytics fixes 4 months ago
Haroon6138 99dfd2cea9 Merge pull request 'Dob & Gender Fix' (#314) from dev_aamir into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/314
4 months ago
Aamir CSol 8b9ba23d72 Merge branch 'refs/heads/master' into dev_aamir 4 months ago
Aamir CSol 3f683917cb Dob Fix, Gender Fix 4 months ago
Sultan khan b6e3c4a5ce Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  Hotfix app update sent to stores, VersionID 21.1, Lakum points implementation contd.
  updates
  Er refferal Fix
  last login issue resolved
  Updates
  updates
  updates & fixes

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/e_referral/new_e_referral.dart
#	lib/presentation/e_referral/widget/e_referral_other_details.dart
4 months ago
Sultan khan 696eeccdbd no message 4 months ago
Sultan khan e05c0dd091 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  updates
  updates
  updates

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
4 months ago
haroon amjad b6c9fb96d4 Hotfix app update sent to stores, VersionID 21.1, Lakum points implementation contd. 4 months ago
haroon amjad 67bcd34344 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 7c49606331 updates 4 months ago
Aamir CSol 8ddd27fe8c Er refferal Fix 4 months ago
haroon amjad 8e13dd72c8 last login issue resolved 4 months ago
haroon amjad 3bb58e2e64 Updates 4 months ago
haroon amjad 4b3c986dc2 updates 4 months ago
haroon amjad 7ef435690d updates & fixes 4 months ago
Sultan khan 8e1625d116 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  Input Field Error Handling
  Input Field Error Handling
4 months ago
Sultan khan d86a9b5ed9 no message 4 months ago
haroon amjad 13cab04791 updates 4 months ago
haroon amjad 695d6566a1 updates 4 months ago
Aamir CSol 91f2cc2ee0 Input Field Error Handling 4 months ago
Aamir CSol c93aa5993e Merge branch 'master' into dev_aamir 4 months ago
Aamir CSol 1911f7ce64 Input Field Error Handling 4 months ago
haroon amjad 021a835fa8 updates 4 months ago
haroon amjad 6532002cdd updates 4 months ago
Sultan khan d9d7a8b7c2 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
* 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New:
  updated scheduleApi Fix
  Completed the SymptomsChecker Changes
  Updates & http client enhancements
  Updates
  updates
  Symptoms checker flow updates and Design Fixes on Fold
  Habib Wallet fix in services page
  Design fixes on Fold
  Updates & fixes
  Design changes on fold
  updates

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
4 months ago
Sultan khan e2adc629b8 e-referral issue and registration crashlytics issue fixed. 4 months ago
faizatflutter b03cbf518c updated scheduleApi Fix 4 months ago
faizatflutter f3f47dfa4f Merge branch 'master' into faiz_dev 4 months ago
faizatflutter 03ce3b617d Completed the SymptomsChecker Changes 4 months ago
haroon amjad c9406aa66d Updates & http client enhancements 4 months ago
haroon amjad 34cc16c24f Updates 4 months ago
haroon amjad 9458e205af Merge branch 'master' into haroon_dev
# Conflicts:
#	lib/presentation/appointments/widgets/appointment_card.dart
#	lib/presentation/hmg_services/services_page.dart
#	lib/presentation/home/landing_page.dart
4 months ago
haroon amjad da904d8183 updates 4 months ago
faizatflutter a9d7190348 Merge branch 'master' into faiz_dev
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/home/landing_page.dart
#	lib/presentation/medical_file/medical_file_page.dart
4 months ago
faizatflutter 63fd82407e Symptoms checker flow updates and Design Fixes on Fold 4 months ago
haroon amjad 121e5bd031 Habib Wallet fix in services page 4 months ago
faizatflutter 7b1684c455 Design fixes on Fold 4 months ago
haroon amjad 0e2b8db63a Updates & fixes 4 months ago
haroon amjad 93cbb563bc Merge branch 'master' into haroon_dev 4 months ago
Sultan khan 8d1a54f295 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
Sultan khan 3ad2f73653 lab test filter sorted. 4 months ago
faizatflutter cb299c5bca Design changes on fold 4 months ago
haroon amjad 1d03c1ff1c updates 4 months ago
haroon amjad 19e102b52d family member add navigation issue fixed 4 months ago
haroon amjad 783c5480f0 Updates 4 months ago
haroon amjad 018f316a01 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad fe749e57b8 Merge branch 'haroon_dev' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into haroon_dev 4 months ago
haroon amjad d09dee9550 updates 4 months ago
aamir-csol dfd7160030 Medical File Navigation & Keyboard Fix 4 months ago
Haroon Amjad 131837bb5c updates 4 months ago
haroon amjad 877f73b384 Notification permission added on app launch, appointment invoice download option added, HMG Wallet added in medical file page 4 months ago
haroon amjad dc26183467 radiology empty state fix 4 months ago
haroon amjad b7d58d9c9d updates 4 months ago
haroon amjad bfdd0fde3c updates 4 months ago
Sultan khan 85b901d3d5 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
4 months ago
haroon amjad e200e84b8e Updates 4 months ago
Sultan khan 2da0d0dcaf update and fixes 4 months ago
Sultan khan 053cda6169 no message 4 months ago
haroon amjad bc95ed35d9 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 16f3298f37 Added shared preferences check in the prescription reminders 4 months ago
Sultan khan c7b6f191ca no message 4 months ago
haroon amjad 91f38203f2 Updates 4 months ago
Sultan khan caa9da2cce Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/livecare/immediate_livecare_payment_details.dart
4 months ago
Sultan khan efa7a39978 no message 4 months ago
haroon amjad 2fd4a3e1a7 Updates 4 months ago
haroon amjad 83f816e271 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 344c9de29f updates 4 months ago
aamir-csol 597b637ca6 Fixes & Translation 4 months ago
aamir-csol e842d85254 Fixes & Translation 4 months ago
haroon amjad 514bf49956 Call screen update 4 months ago
haroon amjad df8ab0dab5 Merge branch 'master' into haroon_dev 4 months ago
haroon amjad 9e9344cd0f updates 4 months ago
aamir-csol 877a7f083e Merge branch 'master' into dev_aamir 4 months ago
aamir-csol 79b0c695c2 Translation 4 months ago
haroon amjad 782cd01b4b updates 4 months ago
haroon amjad bd89a840a0 updates 4 months ago
Sultan khan bd09bd04de no message 4 months ago
aamir-csol 6a180d10de Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
4 months ago
aamir-csol 697642143c Translation & Calender 4 months ago
Sultan khan 246d414fe1 updates and fixes 4 months ago
Sultan khan d9b6e9fed8 fixes and updates 4 months ago
haroon amjad 333f702f80 updates & fixes 4 months ago
haroon amjad 04db991851 updates 4 months ago
aamir-csol 43e3c05ba1 Merge branch 'master' into dev_aamir 4 months ago
aamir-csol ff55257e73 Zoom in and Out 4 months ago
Sultan khan ab7ca36d5d Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/en-US.json
4 months ago
aamir-csol fdf21b725e Zoom in and Out 4 months ago
Sultan khan 5629012825 live care chat url changed 4 months ago
Sultan khan 25cc485830 landing navigation item changed from feed back to health calculator and triage page provided 4 months ago
aamir-csol 458819398d Localization & rad error fix 4 months ago
aamir-csol 2d61535a59 Localization & rad error fix 4 months ago
aamir-csol 42f4333a28 Merge branch 'master' into dev_aamir 4 months ago
khansultan1 ff336e1b0e Merge pull request 'dev_sultan' (#272) from dev_sultan into master
Reviewed-on: #272
4 months ago
aamir-csol e5a055d355 Localization & rad error fix 4 months ago
haroon amjad fe82f12b33 fix for patient share 4 months ago
Sultan khan 56d593430d no message 4 months ago
khansultan1 78cf05c0e5 Merge pull request 'Emergency servicews pages changes of passing the values which are displayed outside' (#270) from changes into master
Reviewed-on: #270
4 months ago
tahaalam b93e23a314 Emergency servicews pages changes of passing the values which are displayed outside 4 months ago
Sultan khan 54a6a5cd90 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 4 months ago
khansultan1 3393874d78 Merge pull request 'social media icons added' (#268) from changes into master
Reviewed-on: #268
4 months ago
Sultan khan 1ef7ed6344 no message 4 months ago
aamir-csol 13040a17a7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
tahaalam fb64d3b957 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/features/authentication/authentication_view_model.dart
#	lib/generated/locale_keys.g.dart
4 months ago
tahaalam e73d2534cc social media elements added for profile and service page 4 months ago
aamir-csol 1c929999f1 Localization 4 months ago
Sultan khan 83a414796a Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
4 months ago
Sultan khan 1366518ce1 fixes and updates 4 months ago
faizatflutter 10db964fd8 Merge branch 'master' into faiz_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
4 months ago
faizatflutter 61f17a3feb fixed api localization issue 4 months ago
Sultan khan b18ddd1ad7 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/generated/locale_keys.g.dart
4 months ago
Sultan khan 8a41b5716f updates 4 months ago
tahaalam 05aaa71cf9 live care changes 4 months ago
faizatflutter 8c925a7f5e Merge branch 'master' into faiz_dev
# Conflicts:
#	ios/Podfile.lock
4 months ago