Commit Graph

198 Commits (877a7f083e8e56411a5305020b666025f05399b6)

Author SHA1 Message Date
aamir-csol 877a7f083e Merge branch 'master' into dev_aamir 17 hours ago
aamir-csol 79b0c695c2 Translation 17 hours ago
haroon amjad 782cd01b4b updates 22 hours ago
aamir-csol 6a180d10de Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
1 day ago
aamir-csol 697642143c Translation & Calender 1 day ago
Sultan khan 246d414fe1 updates and fixes 1 day ago
haroon amjad 333f702f80 updates & fixes 2 days ago
aamir-csol 2d61535a59 Localization & rad error fix 3 days ago
aamir-csol e5a055d355 Localization & rad error fix 3 days ago
khansultan1 3393874d78 Merge pull request 'social media icons added' (#268) from changes into master
Reviewed-on: #268
3 days ago
aamir-csol 13040a17a7 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
3 days 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
3 days ago
tahaalam e73d2534cc social media elements added for profile and service page 3 days ago
aamir-csol 1c929999f1 Localization 3 days 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
3 days ago
faizatflutter 61f17a3feb fixed api localization issue 3 days ago
tahaalam 05aaa71cf9 live care changes 3 days ago
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
4 days 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
4 days ago
aamir-csol baa9ebe7ea Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
4 days ago
Sultan khan 256537cfb3 update and fix 4 days ago
aamir-csol 1849a90b32 Localization 4 days ago
tahaalam cfcbaa85a3 LANGUAGE CHANGES 4 days ago
tahaalam ee8257054e Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/en-US.json
4 days ago
tahaalam 6b4d43caf3 referral hardcoded string changes 4 days ago
Sultan khan fee2001499 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
4 days ago
Sultan khan 929a25d9a4 no message 4 days ago
aamir-csol 1515fc57e5 Localization 4 days ago
Sultan khan bd581c4fe0 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
5 days ago
Sultan khan 82f2adfc3f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 5 days ago
Sultan khan c1c434789e Rad Description & Ai Description 5 days ago
tahaalam a31c4c99df Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_kesy.g.dart
5 days ago
tahaalam 2d36d91ab6 language and stepper changes 5 days ago
aamir-csol 01e56e4fb5 Merge branch 'refs/heads/master' into dev_aamir 5 days ago
aamir-csol db2ccd3be6 Date & Time New Widget For Whole App 5 days ago
tahaalam 50a597b4d3 lang changes 5 days ago
tahaalam 14771b32d3 reminder changes 5 days ago
tahaalam 5a4e5e138b string localization changes 5 days ago
Sultan khan a38a2a0619 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	assets/langs/ar-SA.json
#	lib/generated/codegen_loader.g.dart
6 days ago
tahaalam 994bf95043 updates and fixes 6 days ago
tahaalam befcee7c65 Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
6 days ago
Sultan khan a2c2b24b2a 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:
  health calculator design & timer & bell icon switch changes
  health calculator design & timer & bell icon switch changes
  appointment reminder & weather
  codegen
6 days ago
Sultan khan 2f4db29a70 arabic updated. 6 days ago
aamir-csol 461fa11df3 health calculator design & timer & bell icon switch changes 6 days ago
Sultan khan ac6e96ad6c no message 6 days ago
tahaalam 04d14a4d82 langauge regarding changes 6 days ago
tahaalam 303fb87661 Merge remote-tracking branch 'origin/master' into changes 7 days ago
tahaalam fcf990bc00 hot fixes 7 days ago
Sultan khan cfea843c4f updates and fixes 7 days ago
Sultan khan a144f30f42 no message 1 week ago