Commit Graph

1148 Commits (2ec9331d2f27e829f5c84e90a2ba2fef2b03f7bb)
 

Author SHA1 Message Date
Mohammad Aljammal 2ec9331d2f Merge branch 'fix-pharmacy' into 'development'
Fix pharmacy

See merge request Cloud_Solution/diplomatic-quarter!269
5 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
5 years ago
Mohammad Aljammal b9d043fd7c Merge branch 'prescription_delivery' into 'development'
Done Prescription Delivery Address

See merge request Cloud_Solution/diplomatic-quarter!270
5 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 5 years ago
mosazaid d02b74142a Merge branch 'development' into fix-pharmacy
# Conflicts:
#	lib/core/service/client/base_app_client.dart
5 years ago
mosazaid 1a45f99606 some fixes on pharmacy 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
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
Mohammad Aljammal 87ad027d33 Merge branch 'improve_hhc' into 'development'
Improve hhc

See merge request Cloud_Solution/diplomatic-quarter!264
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
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
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
Mohammad Aljammal ab53ca82b1 fix colors issues 5 years ago
mosazaid 822defbd04 working on bmi calculator design and functionality 5 years ago
haroon amjad 3bad0a3804 Merge branch 'development' into Haroon 5 years ago
haroon amjad 146019432a LiveCare schedule implemented 5 years ago
Sikander Saleem 8f37fbf260 Qr icon added, notify me api added & improvements 5 years ago
Mohammad Aljammal 8eda45d637 Merge branch 'my_tracker' into 'development'
fix bottom nav bar

See merge request Cloud_Solution/diplomatic-quarter!255
5 years ago
Mohammad Aljammal 3e441c55b2 fix bottom nav bar 5 years ago
Mohammad Aljammal 76b2342ad8 Merge branch 'my_tracker' into 'development'
My tracker

See merge request Cloud_Solution/diplomatic-quarter!254
5 years ago
Mohammad Aljammal 9d8c1ddf63 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
 Conflicts:
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal 484cca086e fix my my Trackers 5 years ago
Mohammad Aljammal f0ee9db952 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!253
5 years ago
haroon amjad ab158e14e9 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 5 years ago
Mohammad Aljammal f6fd7587f2 Merge branch 'health-converter' into 'development'
health-converter fix

See merge request Cloud_Solution/diplomatic-quarter!252
5 years ago
hussam al-habibeh b767748315 health-converter fix 5 years ago
hussam al-habibeh 97919c217f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago