Commit Graph

1866 Commits (c58023efc3b64014d2ded4886623837d73bd341b)
 

Author SHA1 Message Date
Sultan Khan c58023efc3 family file fixes 3 years ago
Sultan Khan 0e43ca173a Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan d535cb421d bug fixes 3 years ago
Mirza.Shafique 719cdbd2e4 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 8a4cf9f23b Line Chart Fix in Vital Signs 3 years ago
Sikander Saleem 4caacb968b Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem d9405b2bd0 prescription order log ui changes 3 years ago
Sikander Saleem 8e27d8210a prescription detail ui changes. 3 years ago
Mirza.Shafique 350882b1d2 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique ef2bcc1c65 Web RTC Design implementation 3 years ago
Sikander Saleem 8cb342cb24 Merge branch 'new_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 9d67704c67 prescription detail ui changes(cont). 3 years ago
Sultan khan dfd01d3033 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
login issue fixed

See merge request Cloud_Solution/diplomatic-quarter!392
3 years ago
Sultan Khan 2ebfdcfdd7 login issue fixed 3 years ago
Sikander Saleem 259163481c Merge branch 'development_new_design_2.0' into new_design_sikander 3 years ago
Sikander Saleem f0bb94c422 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 4e0197965c prescription ui changes(cont). 3 years ago
Mirza.Shafique 999a45c711 App Expendable Design Change 3 years ago
Sultan khan 01f88229d3 Merge branch 'sultan_new_design' into 'development_new_design_2.0'
Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!391
3 years ago
Sultan Khan a53d51a899 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan f9f5a886a9 VITAL SIGN FIXED 3 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
3 years ago
Sultan Khan 1d36076320 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan dd58b8637b bug fixs 3 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
3 years ago
hussam al-habibeh e4d54f0c0b parent product and sub product update 3 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
3 years ago
hussam al-habibeh 0a1db70229 parent product and sub product update 3 years ago
Mirza.Shafique ad3fbdf323 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 717c7b3be4 Lab results designs enhancements 3 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
3 years ago
Zohaib Iqbal Kambrani 3f178e3e3f Google_Huawei Map -> AppMap 3 years ago
Mohammad Aljammal 1d7e97a9af Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!386
3 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
3 years ago
Fatimah Alshammari bcfbca98a1 fixed arabic version 3 years ago
Mohammad Aljammal 473f372a85 Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering

See merge request Cloud_Solution/diplomatic-quarter!388
3 years ago
hussam al-habibeh cb9d8cb9d9 fix pharmacy products filtering 3 years ago
hussam al-habibeh b0165c0d29 fix pharmacy products filtering 3 years ago
Mirza.Shafique 275b95be99 Images deleted from assets 3 years ago
Fatimah Alshammari 2caf4d4837 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 3 years ago
Mirza.Shafique dfc6e3bbc1 CMC 1.7 3 years ago
Mirza.Shafique d7314f7555 Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 3 years ago
haroon amjad 32462ff5ba covid translation updates 3 years ago
haroon amjad f946a7be4d updates & fixes 3 years ago
Mirza.Shafique f20883184e CMC 1.5 3 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 3 years ago
Sultan Khan c6fd52aad2 home health care 3 years ago
haroon amjad 948f4fc6b8 CMC Add address fixes 3 years ago