Commit Graph

190 Commits (513422cb03acf20b0f9c6e5cc4c0c9905ae9b88b)

Author SHA1 Message Date
aamir-csol cb2e3c7574 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/presentation/book_appointment/select_clinic_page.dart
12 hours ago
Sultan khan 6c3808effe 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/blood_donation/widgets/select_gender_widget.dart
#	lib/presentation/comprehensive_checkup/comprehensive_checkup_page.dart
12 hours ago
Sultan khan 256537cfb3 update and fix 12 hours ago
aamir-csol 1849a90b32 Localization 12 hours ago
tahaalam cfcbaa85a3 LANGUAGE CHANGES 12 hours ago
aamir-csol 60b71e9b1d Merge branch 'master' into dev_aamir 18 hours ago
aamir-csol 1515fc57e5 Localization 18 hours ago
Sultan khan 94993fa6fb fixes and updates 18 hours ago
tahaalam 50a597b4d3 lang changes 2 days ago
tahaalam 14771b32d3 reminder changes 2 days ago
aamir-csol 4c56137f10 calender 2 days ago
tahaalam befcee7c65 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
3 days ago
aamir-csol f0b8db0318 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/medical_file/medical_file_view_model.dart
#	lib/presentation/appointments/appointment_details_page.dart
3 days ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 3 days ago
tahaalam 04d14a4d82 langauge regarding changes 3 days ago
Sultan khan 16e898bb6c updates and fixes 3 days ago
aamir-csol 90bcdf674d Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
3 days ago
tahaalam fcf990bc00 hot fixes 4 days ago
aamir-csol 2b0f8b45b0 appointment reminder & weather 4 days ago
Sultan khan 8e8177e573 fixes and updates 5 days ago
haroon amjad 5b44329972 updates 7 days ago
haroon amjad ad0cbe1e21 updates 1 week ago
haroon amjad bb274e80c1 updates 1 week ago
haroon amjad fe1e0fdb40 Updates 1 week ago
haroon amjad 572c37785b updates 1 week ago
haroon amjad 185f505ed9 pull down to refresh in appointment queue implemented 1 week ago
haroon amjad 71030c0fe9 Updates & fixes 1 week ago
haroon amjad e3f5bb69ac Updates 1 week ago
haroon amjad 89a1da4407 Updates 1 week ago
haroon amjad 56f5151c0c Font changes, Updates & fixes 1 week ago
haroon amjad 453cfc07e1 Updates 1 week ago
haroon amjad 1fa03fff5e updates 1 week ago
haroon amjad 21477f34dc updates 1 week ago
haroon amjad 0eb9ec11d3 remote localization files added 1 week ago
haroon amjad f929bd9017 Updates 1 week ago
haroon amjad 400e5daac0 Dr Search fixed 1 week ago
haroon amjad 3d39190c62 updates & fixes 1 week ago
haroon amjad a8620c1f72 updates 2 weeks ago
haroon amjad 75531c2254 Merge branch 'master' into haroon_dev 2 weeks ago
haroon amjad 4959392f74 Updates 2 weeks ago
aamir-csol 5be4f66718 doctor ratings. 2 weeks ago
haroon amjad f7446d0d41 updates 2 weeks ago
haroon amjad 3703afe8bd updates 2 weeks ago
haroon amjad edeae70aa0 Updates 2 weeks ago
haroon amjad 1f290c5bfe updates 2 weeks ago
haroon amjad deca29b423 updates & fixes 2 weeks ago
haroon amjad 93af246700 updates 2 weeks ago
haroon amjad f9f2e22376 updates 2 weeks ago
haroon amjad 7e73741d08 Bookmark icons added 2 weeks ago
haroon amjad bd65d05e9e Merge branch 'master' into haroon_dev 2 weeks ago