Commit Graph

966 Commits (576181a72e817c8aedec60a83c1de85edb2e865f)

Author SHA1 Message Date
Mohammad Aljammal 576181a72e Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!251
4 years ago
mosazaid dfeb70c892 Merge branch 'development' into pharmacy-payment-feature
# Conflicts:
#	lib/pages/pharmacy/order/OrderDetails.dart
4 years ago
mosazaid 0b2002d4dd finish payment order 4 years ago
Sultan Khan 1a35fe37b6 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan e61c26b853 Auto SMS, Themes, Voice Command 4 years ago
haroon amjad da3ad90ddd added app-wide route transition animation 4 years ago
haroon amjad d8e11f7187 Merge branch 'development' into Haroon 4 years ago
haroon amjad deb0b40cfe fixes 4 years ago
mosazaid c64769e422 Merge branch 'development' into pharmacy-payment-feature 4 years ago
mosazaid f3cdd08857 adding fharmacy payment feature 4 years ago
hussam al-habibeh e050f87a64 pharmacy bugs 4 years ago
hussam al-habibeh 8c58dced7d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/core/service/pharmacy_categorise_service.dart
	lib/pages/final_products_page.dart
4 years ago
hussam al-habibeh 1b76d9c192 pharmacy bugs fixed 4 years ago
mosazaid 125dd27a00 Merge branch 'development' into fix-pharmacy 4 years ago
mosazaid 5d0a122689 fix bugs 4 years ago
Mohammad Aljammal e6da54c201 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 20ad10b9dc Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 4 years ago
mosazaid d02b74142a Merge branch 'development' into fix-pharmacy
# Conflicts:
#	lib/core/service/client/base_app_client.dart
4 years ago
mosazaid 1a45f99606 some fixes on pharmacy 4 years ago
haroon amjad 5e8e3806d6 Covid Drive-Thru implemented 4 years ago
Sultan Khan 144ef52c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan b3e6c4efda voice command changes 4 years ago
haroon amjad ba10014b46 Merge branch 'development' into Haroon 4 years ago
Mohammad Aljammal 0632af3fb5 Fix the Authentication Pharmacy 4 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 4 years ago
haroon amjad 83cca264f1 Merge branch 'LamaHerbish' into Haroon 4 years ago
HMG\Lama.Herbish 031be1ac56 fixes 4 years ago
haroon amjad 0dc35f1270 Merge branch 'development' into Haroon 4 years ago
mosazaid b70c7d7d05 fix pharmacy auth 4 years ago
haroon amjad f72c860516 Merge branch 'development' into Haroon 4 years ago
haroon amjad 60ea0465fd fixes & updates 4 years ago
Mohammad Aljammal 87ad027d33 Merge branch 'improve_hhc' into 'development'
Improve hhc

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

See merge request Cloud_Solution/diplomatic-quarter!262
4 years ago
haroon amjad 9ecf745747 fixes 4 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
4 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
4 years ago
mosazaid 0444b21101 Merge branch 'development' into hmg-services-fixing
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababah 94ee969406 hhc msg translation 4 years ago
Elham Rababah 8a1924cca2 fix images in hhc 4 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 9fca52efca voice command 4 years ago
Sultan Khan eeb073fb17 voice command 4 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
4 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 4 years ago
Mohammad Aljammal 63657cb7c4 Merge branch 'h2o_improvement' into 'development'
H2O feature, setting page added

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

See merge request Cloud_Solution/diplomatic-quarter!259
4 years ago