Commit Graph

1932 Commits (ab8030416c05f31213d34b9397afcd9532bb2b0a)
 

Author SHA1 Message Date
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
haroon amjad ad3463bbfc active medication design revamped 3 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
3 years ago
haroon amjad 304ba8afa4 bas app client fixes 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
haroon amjad 05354f72cc pharmacy import fixes 3 years ago
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
3 years ago
haroon amjad b3dffc992c App expandable fixes 3 years ago
haroon amjad a2e25f7a7a Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 98837b2298 WebRTC implementation 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
haroon amjad 1200dbeb70 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad 322a32be21 WebRTC Implementing 3 years ago
haroon amjad d9d4720ded pubspec updated 3 years ago
haroon amjad c050633671 SignalR Updates 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
haroon amjad 0a90791aca Push notification fixes 3 years ago
haroon amjad eeb20073cb Medicine prescriptions fixes from appointment details page 3 years ago
haroon amjad 298a8f4cff Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
#	lib/pages/DrawerPages/family/my-family.dart
3 years ago
haroon amjad b1128be94f Updates & fixes 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
haroon amjad e5a636b704 Covid Test changes 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
haroon amjad e8bb4e962c Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
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