Commit Graph

2906 Commits (3896f02d13ec3d4edfa187b9beda7e9fa366ea06)
 

Author SHA1 Message Date
haroon amjad b1128be94f Updates & fixes 4 years ago
Sultan khan 585d8067ad Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!390
4 years ago
Sultan Khan 1d36076320 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan dd58b8637b bug fixs 4 years ago
haroon amjad e5a636b704 Covid Test changes 4 years ago
Fatimah Alshammari b3285f4528 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/sub_categorise_page.dart
4 years ago
Fatimah Alshammari bdededa397 fixed arabic version 4 years ago
Mohammad Aljammal cfe9e35c38 Merge branch 'blood_pressure' into 'development'
parent product and sub product update

See merge request Cloud_Solution/diplomatic-quarter!389
4 years ago
hussam al-habibeh e4d54f0c0b parent product and sub product update 4 years ago
hussam al-habibeh f1c2dbbbfc Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into blood_pressure
 Conflicts:
	lib/pages/parent_categorise_page.dart
	lib/pages/sub_categorise_page.dart
4 years ago
hussam al-habibeh 0a1db70229 parent product and sub product update 4 years ago
haroon amjad e8bb4e962c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
4 years ago
Mirza.Shafique ad3fbdf323 Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique 717c7b3be4 Lab results designs enhancements 4 years ago
Zohaib Iqbal Kambrani 581bbe63bb Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
* 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter:
  Images deleted from assets
  CMC 1.7
  CMC 1.6
  CMC 1.5
4 years ago
Zohaib Iqbal Kambrani 3f178e3e3f Google_Huawei Map -> AppMap 4 years ago
Mohammad Aljammal 1d7e97a9af Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!386
4 years ago
Fatimah Alshammari a4bf52818e Merge branch 'development' into fatima-new 4 years ago
Fatimah Alshammari 7ebeb8cb4b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/sub_categorise_page.dart
4 years ago
Fatimah Alshammari bcfbca98a1 fixed arabic version 4 years ago
Mohammad Aljammal 473f372a85 Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering

See merge request Cloud_Solution/diplomatic-quarter!388
4 years ago
hussam al-habibeh cb9d8cb9d9 fix pharmacy products filtering 4 years ago
hussam al-habibeh b0165c0d29 fix pharmacy products filtering 4 years ago
Mirza.Shafique 275b95be99 Images deleted from assets 4 years ago
haroon amjad 7467da7409 Imports organized 4 years ago
Fatimah Alshammari 2caf4d4837 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 4 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 4 years ago
Mirza.Shafique dfc6e3bbc1 CMC 1.7 4 years ago
haroon amjad c186c9f186 Merge branch 'development_new_design_2.0' into haroon-new-design 4 years ago
haroon amjad 0fe4a21388 updates & fixes 4 years ago
Mirza.Shafique d7314f7555 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 4 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 4 years ago
haroon amjad 32462ff5ba covid translation updates 4 years ago
haroon amjad f946a7be4d updates & fixes 4 years ago
Mirza.Shafique f20883184e CMC 1.5 4 years ago
Sultan Khan 32f62fbe56 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan c6fd52aad2 home health care 4 years ago
haroon amjad 948f4fc6b8 CMC Add address fixes 4 years ago
Sultan Khan 4d00664045 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
Sultan Khan c6404a2a0b tracker services 4 years ago
haroon amjad 74ca9995c9 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
4 years ago
haroon amjad 2d7c7239c5 Health Converters fixes 4 years ago
Mirza.Shafique 2d38e8905b CMC 1.4 4 years ago
haroon amjad 2bba42b574 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 4 years ago
haroon amjad f795ba24c5 updates & fixes 4 years ago
Mirza.Shafique d1bc46f451 CMC Marge 4 years ago
Mirza.Shafique a67c5afcfb Merge branch 'mirza_home_page' into development_new_design_2.0 4 years ago
Mirza.Shafique e890c80831 CMC 1.3 4 years ago
Mohammad Aljammal 9fb4e79c34 Merge branch 'sep_fixes' into 'development'
Sep fixes

See merge request Cloud_Solution/diplomatic-quarter!387
4 years ago
Elham Rababh bb372210e0 PAP-938: fix Referral sent 4 years ago