Commit Graph

2906 Commits (3896f02d13ec3d4edfa187b9beda7e9fa366ea06)
 

Author SHA1 Message Date
Sultan Khan 3e947dda37 Merge branch 'sultan-patientapp' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan e20eed2f6e voice command changes merged 5 years ago
Sultan Khan 144ef52c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan b3e6c4efda voice command changes 5 years ago
haroon amjad ba10014b46 Merge branch 'development' into Haroon 5 years ago
enadhilal 60648d368f Merge branch 'development' into enad_pharmacy2 5 years ago
enadhilal 830e871e2c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
5 years ago
Mohammad Aljammal 4d950d3933 Merge branch 'prescription_delivery' into 'development'
Fix the Authentication Pharmacy

See merge request Cloud_Solution/diplomatic-quarter!267
5 years ago
Mohammad Aljammal 0632af3fb5 Fix the Authentication Pharmacy 5 years ago
Mohammad Aljammal b8ded38dc2 Merge branch 'prescription_delivery' into 'development'
add Prescription Delivery Address Page and fix the Authentication Pharmacy

See merge request Cloud_Solution/diplomatic-quarter!266
5 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 5 years ago
haroon amjad 83cca264f1 Merge branch 'LamaHerbish' into Haroon 5 years ago
HMG\Lama.Herbish 031be1ac56 fixes 5 years ago
haroon amjad 0dc35f1270 Merge branch 'development' into Haroon 5 years ago
Mohammad Aljammal 2ed1d244d8 Merge branch 'fix-pharmacy' into 'development'
fix pharmacy auth

See merge request Cloud_Solution/diplomatic-quarter!265
5 years ago
mosazaid b70c7d7d05 fix pharmacy auth 5 years ago
enadhilal 292e983614 fixing issues 5 years ago
enadhilal de4af313fa Merge branch 'development' into enad_pharmacy2 5 years ago
enadhilal 57e9599f78 Merge branch 'development' into enad_pharmacy2 5 years ago
haroon amjad f72c860516 Merge branch 'development' into Haroon 5 years ago
haroon amjad 60ea0465fd fixes & updates 5 years ago
Mohammad Aljammal 87ad027d33 Merge branch 'improve_hhc' into 'development'
Improve hhc

See merge request Cloud_Solution/diplomatic-quarter!264
5 years ago
haroon amjad 13f6015cf0 Merge branch 'development' into Haroon 5 years ago
haroon amjad 69649ff7f8 added verified icon in homepage when patient is logged in 5 years ago
Mohammad Aljammal 29f4e6acb6 Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing

See merge request Cloud_Solution/diplomatic-quarter!262
5 years ago
Mohammad Aljammal ddea17a87c Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!263
5 years ago
haroon amjad 9ecf745747 fixes 5 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
Fatimah Alshammari ef8312f2b8 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/pharmacies/product_detail.dart
5 years ago
Fatimah Alshammari ce64da11e4 homepage and product details design 5 years ago
mosazaid cbe422cbc6 Merge branch 'hmg-services-fixing' into development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid 0444b21101 Merge branch 'development' into hmg-services-fixing
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah 94ee969406 hhc msg translation 5 years ago
Elham Rababah 8a1924cca2 fix images in hhc 5 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9fca52efca voice command 5 years ago
Sultan Khan eeb073fb17 voice command 5 years ago
Mohammad Aljammal e964afd4f2 Merge branch 'fix_security_issue' into 'development'
fix security issues in pharmacy

See merge request Cloud_Solution/diplomatic-quarter!261
5 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 5 years ago
Mohammad Aljammal 63657cb7c4 Merge branch 'h2o_improvement' into 'development'
H2O feature, setting page added

See merge request Cloud_Solution/diplomatic-quarter!260
5 years ago
Sikander Saleem e40ad85d61 H2O feature, setting page added 5 years ago
Mohammad Aljammal 1d724a8db6 Merge branch 'h2o_improvement' into 'development'
H2o improvement

See merge request Cloud_Solution/diplomatic-quarter!259
5 years ago
Sikander Saleem bd062150c1 H2O feature improvement 5 years ago
Sikander Saleem aef4c7bfac H2O feature improvement 5 years ago
haroon amjad 0b83089b86 Merge branch 'development' into Haroon 5 years ago
haroon amjad 3832cee1ad Translation fixes 5 years ago
Sikander Saleem 3b4e791017 H2O feature improvement 5 years ago
Mohammad Aljammal ca82024f9e Merge branch 'fix_pharmacy' into 'development'
Fix pharmacy

See merge request Cloud_Solution/diplomatic-quarter!258
5 years ago
Mohammad Aljammal bb42647c91 Merge branch 'development' into 'fix_pharmacy'
# Conflicts:
#   lib/pages/login/login.dart
5 years ago
Mohammad Aljammal f1f28f5ed0 Merge branch 'fix_login_design' into 'development'
fix colors issues

See merge request Cloud_Solution/diplomatic-quarter!257
5 years ago