Commit Graph

1318 Commits (changes)
 

Author SHA1 Message Date
tahaalam 513422cb03 Merge remote-tracking branch 'origin/master' into changes 4 hours ago
tahaalam bf7b0d922e weather permission issue 4 hours ago
khansultan1 a651e2a650 Merge pull request 'Localization' (#261) from dev_aamir into master
Reviewed-on: #261
4 hours 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 hours ago
khansultan1 b51cd52fa4 Merge pull request 'dev_sultan' (#260) from dev_sultan into master
Reviewed-on: #260
5 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
5 hours ago
khansultan1 d7794d8ab2 Merge pull request 'language changes' (#258) from changes into master
Reviewed-on: #258
5 hours ago
aamir-csol baa9ebe7ea Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
5 hours ago
Sultan khan 256537cfb3 update and fix 5 hours ago
aamir-csol 1849a90b32 Localization 5 hours ago
tahaalam c91d25add3 Merge remote-tracking branch 'origin/master' into changes 5 hours ago
tahaalam cfcbaa85a3 LANGUAGE CHANGES 5 hours ago
Sultan khan 086df4cdd8 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 10 hours ago
khansultan1 fbe2406d34 Merge pull request 'map changes and refferal changes' (#255) from changes into master
Reviewed-on: #255
10 hours ago
tahaalam ee8257054e Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/en-US.json
10 hours ago
tahaalam 6b4d43caf3 referral hardcoded string changes 10 hours ago
khansultan1 fecf17fb7e Merge pull request 'dev_sultan' (#257) from dev_sultan into master
Reviewed-on: #257
10 hours ago
tahaalam 28d03644ba Merge remote-tracking branch 'origin/master' into changes
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
10 hours 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
10 hours ago
Sultan khan 929a25d9a4 no message 10 hours ago
khansultan1 43497a2f11 Merge pull request 'Localization' (#256) from dev_aamir into master
Reviewed-on: #256
10 hours ago
tahaalam 138e65d6fc Merge remote-tracking branch 'origin/master' into changes 10 hours ago
aamir-csol 60b71e9b1d Merge branch 'master' into dev_aamir 10 hours ago
aamir-csol 1515fc57e5 Localization 11 hours ago
tahaalam bf9b88e79c map prescriptiojn changes
date sorting for the rrt and amublance history.
weather issue,
e refferal langauge
11 hours ago
Sultan khan a81044c7eb Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 11 hours ago
khansultan1 8be2398cc6 Merge pull request 'fixes and updates' (#254) from dev_sultan into master
Reviewed-on: #254
11 hours ago
Sultan khan 94993fa6fb fixes and updates 11 hours ago
tahaalam 66e23197c5 referral lingual change 15 hours ago
khansultan1 1e65a67f0e Merge pull request 'dev_sultan' (#253) from dev_sultan into master
Reviewed-on: #253
1 day ago
Sultan khan 42e710c61f Rad Description & Ai Description 1 day 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
1 day ago
khansultan1 248faa3ac7 Merge pull request 'language changes' (#251) from changes into master
Reviewed-on: #251
1 day ago
Sultan khan 82f2adfc3f Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 day ago
Sultan khan c1c434789e Rad Description & Ai Description 1 day 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
1 day ago
tahaalam 2d36d91ab6 language and stepper changes 1 day ago
khansultan1 2c45063291 Merge pull request 'Calendar Design Changes' (#250) from dev_aamir into master
Reviewed-on: #250
1 day ago
Sultan khan c2dcf95d52 update and fix 1 day ago
aamir-csol 01e56e4fb5 Merge branch 'refs/heads/master' into dev_aamir 1 day ago
aamir-csol db2ccd3be6 Date & Time New Widget For Whole App 1 day ago
tahaalam 50a597b4d3 lang changes 1 day ago
Sultan khan 6bc80a394d Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 day ago
khansultan1 f14958f9e1 Merge pull request 'reminder changes' (#248) from changes into master
Reviewed-on: #248
1 day ago
tahaalam 14771b32d3 reminder changes 1 day ago
Sultan khan c2d468bd74 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 day ago
khansultan1 5c3b1fe448 Merge pull request 'localization changes' (#247) from changes into master
Reviewed-on: #247
1 day ago
tahaalam 5a4e5e138b string localization changes 1 day ago
Sultan khan 898cbb0a78 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 1 day ago
khansultan1 8e9c5ae6df Merge pull request 'radiology ai Analysis' (#246) from dev_aamir into master
Reviewed-on: #246
1 day ago