Commit Graph

3163 Commits (7fc47ebf341f6aaa6b8f61ba8c676799e09fa7d6)
 

Author SHA1 Message Date
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Elham Rababah fd80afeb5a finish hhc module 5 years ago
Elham Rababah 3ef22be7da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/config.dart
5 years ago
Elham Rababah a87855f445 Fix issues on hhc module 5 years ago
Mohammad Aljammal 3c54ed00f9 Merge branch 'child_vaccines' into 'master'
Child vaccines

See merge request Cloud_Solution/diplomatic-quarter!134
5 years ago
Mohammad Aljammal 49974f81db add translations to child Vaccination 5 years ago
Mohammad Aljammal 8b38ce2267 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!133
5 years ago
Sultan Khan 5e6bcadec0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 603833db37 login changes 5 years ago
Sultan Khan 340b9770c8 login 5 years ago
haroon amjad e5feef8a9d Updates & UI Fixes 5 years ago
Sultan Khan 799fca346b health weather indicator 5 years ago
Sultan Khan 8612ae91c4 sultan 5 years ago
Sultan Khan 0f80224016 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal fa01d132c7 merger DQ live and fix some issues on Child Vaccines 5 years ago
Mohammad Aljammal a556e8c1f8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
 Conflicts:
	lib/config/config.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
5 years ago
haroon amjad 01512e6332 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal 47c980a412 Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
add Radiology translations and colors

See merge request Cloud_Solution/diplomatic-quarter!131
5 years ago
Mohammad Aljammal 482ec536de Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing
 Conflicts:
	lib/config/config.dart
5 years ago
Mohammad Aljammal b6d2878cf1 add Radiology translations and colors 5 years ago
Mohammad Aljammal 6cb3224226 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!129
5 years ago
haroon amjad 8400254020 Merge branch 'pharmacy-Fatima' into 'pharmacy'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!130
5 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 5 years ago
Sultan Khan 22676fcbd1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 5bb780c4ac push 5 years ago
haroon amjad ebb8a8fa2c Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal d0891ba16b Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix lab result translations and colors

See merge request Cloud_Solution/diplomatic-quarter!128
5 years ago
Mohammad Aljammal b504f379de fix lab result translations and colors 5 years ago
Mohammad Aljammal 2731c5b1d4 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!127
5 years ago
Sultan Khan d6a0188c76 fingerprint 5 years ago
Sultan Khan 7c33c06c0c fingerprint 5 years ago
Sultan Khan 1b678e0aca fingerprint 5 years ago
Sultan Khan 6a14214a0f no message 5 years ago
Sultan Khan 24b7bca471 no message 5 years ago
haroon amjad c74ac3b7ca Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljammal 92b18bce07 Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix vital Sign

See merge request Cloud_Solution/diplomatic-quarter!126
5 years ago
haroon amjad 720f82ea80 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 85062859c8 updates 5 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 5 years ago
Mohammad Aljammal caf930050f Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!125
5 years ago
haroon amjad 10025103ac Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 21c7c94ef2 updates & fixes 5 years ago
Mohammad Aljammal 9fcf87126a Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!124
5 years ago
Sultan Khan b61e734f80 feedback permission 5 years ago
Sultan Khan 6bbdf05f90 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 857fc813cd button feedback 5 years ago
Mohammad Aljammal 51a03b83fa Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
advance payment & payment flow issues fixed

See merge request Cloud_Solution/diplomatic-quarter!123
5 years ago
Sultan Khan 29eaa26b36 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 571bda9100 permission 5 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 5 years ago