Commit Graph

1395 Commits (41f971fd01e0e67f5d79b752168f8b7f5c0c5a3d)
 

Author SHA1 Message Date
Sultan khan 41f971fd01 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 4 days ago
Haroon6138 2a4b80ff99 Merge pull request 'haroon_dev' (#284) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/284
4 days ago
haroon amjad 782cd01b4b updates 4 days ago
haroon amjad bd89a840a0 updates 5 days ago
haroon amjad 9adac10d39 Merge branch 'master' into haroon_dev 5 days ago
khansultan1 8485018a6c Merge pull request 'dev_sultan' (#283) from dev_sultan into master
Reviewed-on: #283
5 days ago
Sultan khan bd09bd04de no message 5 days ago
Sultan khan be5b33ce78 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 5 days ago
khansultan1 d01aa1382a Merge pull request 'Calendar & Localization' (#282) from dev_aamir into master
Reviewed-on: #282
5 days ago
aamir-csol 6a180d10de Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
5 days ago
aamir-csol 697642143c Translation & Calender 5 days ago
khansultan1 d955a1faa7 Merge pull request 'dev_sultan' (#281) from dev_sultan into master
Reviewed-on: #281
5 days ago
Sultan khan 95ea4d4446 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 5 days ago
Sultan khan 246d414fe1 updates and fixes 5 days ago
haroon amjad 81e7d76f3f Merge branch 'Android_16_KB_page_size' into haroon_dev 5 days ago
haroon amjad c12c90651e 16 KB page alignment updates 5 days ago
khansultan1 03efa7bcba Merge pull request 'dev_sultan' (#280) from dev_sultan into master
Reviewed-on: #280
5 days ago
Sultan khan d9b6e9fed8 fixes and updates 5 days ago
Sultan khan a9d34bc22c 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 & fixes
  updates
5 days ago
Haroon6138 ee4d6c1c81 Merge pull request 'haroon_dev' (#279) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/279
5 days ago
haroon amjad 333f702f80 updates & fixes 5 days ago
haroon amjad 04db991851 updates 6 days ago
khansultan1 0826a43499 Merge pull request 'dev_sultan' (#278) from dev_sultan into master
Reviewed-on: #278
6 days ago
Sultan khan 7654dbb4f6 no message 6 days ago
Sultan khan b46e73565a Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 6 days ago
khansultan1 7a9ca5ae36 Merge pull request 'Localization & Permission & Toggle Zoom In Body' (#277) from dev_aamir into master
Reviewed-on: #277
6 days ago
aamir-csol 43e3c05ba1 Merge branch 'master' into dev_aamir 6 days ago
khansultan1 855a4e1032 Merge pull request 'dev_sultan' (#276) from dev_sultan into master
Reviewed-on: #276
6 days ago
aamir-csol a017433e3e Merge branch 'master' into dev_aamir 6 days ago
aamir-csol ff55257e73 Zoom in and Out 6 days 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
6 days ago
aamir-csol fdf21b725e Zoom in and Out 6 days ago
khansultan1 e9f812eee7 Merge pull request 'Localization' (#274) from dev_aamir into master
Reviewed-on: #274
6 days ago
Sultan khan 5629012825 live care chat url changed 6 days ago
Sultan khan 25cc485830 landing navigation item changed from feed back to health calculator and triage page provided 6 days ago
aamir-csol 458819398d Localization & rad error fix 6 days ago
aamir-csol 8c321c223d Merge branch 'master' into dev_aamir 6 days ago
aamir-csol 2d61535a59 Localization & rad error fix 6 days ago
Sultan khan ad75f6fdbc Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 6 days ago
khansultan1 9af2c88a19 Merge pull request 'Localization' (#273) from dev_aamir into master
Reviewed-on: #273
6 days ago
aamir-csol 42f4333a28 Merge branch 'master' into dev_aamir 6 days ago
Sultan khan d8950b2ffc Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 6 days ago
khansultan1 ff336e1b0e Merge pull request 'dev_sultan' (#272) from dev_sultan into master
Reviewed-on: #272
6 days ago
aamir-csol e5a055d355 Localization & rad error fix 6 days ago
Sultan khan b2bd03365c Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 6 days ago
Haroon6138 a19cf13f0a Merge pull request 'fix for patient share' (#271) from haroon_dev into master
Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/271
6 days ago
haroon amjad fe82f12b33 fix for patient share 6 days ago
Sultan khan f794d2b371 Merge branch 'master' of http://34.17.182.140/Haroon6138/HMG_Patient_App_New into dev_sultan 6 days ago
Sultan khan 56d593430d no message 6 days 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
7 days ago